From 067a0a8a78603050c8a454594e205ecd754b37ad Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Wed, 13 Mar 2013 17:07:47 +0900 Subject: [PATCH] Fix checkstyle --- .../codec/protobuf/ProtobufDecoder.java | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufDecoder.java b/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufDecoder.java index 0f3d619b04..c6d6b844ed 100644 --- a/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufDecoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufDecoder.java @@ -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 * Google Protocol Buffers @@ -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(); } } }