andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix checkstyle

Browse Source
This commit is contained in:
Trustin Lee 2013-03-13 17:07:47 +09:00
parent f7f6e69bb6
commit 067a0a8a78
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufDecoder.java
View File

@ -15,8 +15,10 @@
*/
package org.jboss.netty.handler.codec.protobuf;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.Message;
import com.google.protobuf.MessageLite;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBufferInputStream;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandler.Sharable;
import org.jboss.netty.channel.ChannelHandlerContext;
@ -27,10 +29,6 @@ import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
import org.jboss.netty.handler.codec.frame.LengthFieldPrepender;
import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.Message;
import com.google.protobuf.MessageLite;
/**
* Decodes a received {@link ChannelBuffer} into a
* <a href="http://code.google.com/p/protobuf/">Google Protocol Buffers</a>
@ -110,26 +108,26 @@ public class ProtobufDecoder extends OneToOneDecoder {
final int offset;
final int length = buf.readableBytes();
if (buf.hasArray()){
if (buf.hasArray()) {
array = buf.array();
offset = buf.arrayOffset() + buf.readerIndex();
}else {
} else {
array = new byte[length];
buf.getBytes(buf.readerIndex(),array,0,length);
buf.getBytes(buf.readerIndex(), array, 0, length);
offset = 0;
}
if (extensionRegistry == null){
if(HAS_PARSER){
return prototype.getParserForType().parseFrom(array,offset,length);
}else{
return prototype.newBuilderForType().mergeFrom(array,offset,length).build();
if (extensionRegistry == null) {
if (HAS_PARSER) {
return prototype.getParserForType().parseFrom(array, offset, length);
} else {
return prototype.newBuilderForType().mergeFrom(array, offset, length).build();
}
}else {
if(HAS_PARSER){
return prototype.getParserForType().parseFrom(array,offset,length,extensionRegistry);
}else{
return prototype.newBuilderForType().mergeFrom(array,offset,length,extensionRegistry).build();
} else {
if (HAS_PARSER) {
return prototype.getParserForType().parseFrom(array, offset, length, extensionRegistry);
} else {
return prototype.newBuilderForType().mergeFrom(array, offset, length, extensionRegistry).build();
}
}
}