Corrected spellings.

shroman · shroman · commit c5d9fcb548ac · 2017-03-09T18:07:54.000+09:00
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
@@ -125,7 +125,7 @@ public static BrokerController createBrokerController(String[] args) {
                     properties = new Properties();
                     properties.load(in);
 
-                    parsePropertie2SystemEnv(properties);
+                    properties2SystemEnv(properties);
                     MixAll.properties2Object(properties, brokerConfig);
                     MixAll.properties2Object(properties, nettyServerConfig);
                     MixAll.properties2Object(properties, nettyClientConfig);
@@ -212,9 +212,9 @@ public void run() {
                         log.info("Shutdown hook was invoked, {}", this.shutdownTimes.incrementAndGet());
                         if (!this.hasShutdown) {
                             this.hasShutdown = true;
-                            long begineTime = System.currentTimeMillis();
+                            long beginTime = System.currentTimeMillis();
                             controller.shutdown();
-                            long consumingTimeTotal = System.currentTimeMillis() - begineTime;
+                            long consumingTimeTotal = System.currentTimeMillis() - beginTime;
                             log.info("Shutdown hook over, consuming total time(ms): {}", consumingTimeTotal);
                         }
                     }
@@ -230,10 +230,12 @@ public void run() {
         return null;
     }
 
-    private static void parsePropertie2SystemEnv(Properties properties) {
+    private static void properties2SystemEnv(Properties properties) {
         if (properties == null) {
+            log.info("No properties to set system environment");
             return;
         }
+
         String rmqAddressServerDomain = properties.getProperty("rmqAddressServerDomain", MixAll.DEFAULT_NAMESRV_ADDR_LOOKUP);
         String rmqAddressServerSubGroup = properties.getProperty("rmqAddressServerSubGroup", "nsaddr");
         System.setProperty("rocketmq.namesrv.domain", rmqAddressServerDomain);
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/pagecache/ManyMessageTransfer.java b/broker/src/main/java/org/apache/rocketmq/broker/pagecache/ManyMessageTransfer.java
@@ -27,7 +27,9 @@
 public class ManyMessageTransfer extends AbstractReferenceCounted implements FileRegion {
     private final ByteBuffer byteBufferHeader;
     private final GetMessageResult getMessageResult;
-    private long transfered; // the bytes which was transfered already
+
+    /** Bytes which were transferred already. */
+    private long transferred;
 
     public ManyMessageTransfer(ByteBuffer byteBufferHeader, GetMessageResult getMessageResult) {
         this.byteBufferHeader = byteBufferHeader;
@@ -46,7 +48,7 @@ public long position() {
 
     @Override
     public long transfered() {
-        return transfered;
+        return transferred;
     }
 
     @Override
@@ -57,14 +59,14 @@ public long count() {
     @Override
     public long transferTo(WritableByteChannel target, long position) throws IOException {
         if (this.byteBufferHeader.hasRemaining()) {
-            transfered += target.write(this.byteBufferHeader);
-            return transfered;
+            transferred += target.write(this.byteBufferHeader);
+            return transferred;
         } else {
             List<ByteBuffer> messageBufferList = this.getMessageResult.getMessageBufferList();
             for (ByteBuffer bb : messageBufferList) {
                 if (bb.hasRemaining()) {
-                    transfered += target.write(bb);
-                    return transfered;
+                    transferred += target.write(bb);
+                    return transferred;
                 }
             }
         }
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/pagecache/OneMessageTransfer.java b/broker/src/main/java/org/apache/rocketmq/broker/pagecache/OneMessageTransfer.java
@@ -26,7 +26,9 @@
 public class OneMessageTransfer extends AbstractReferenceCounted implements FileRegion {
     private final ByteBuffer byteBufferHeader;
     private final SelectMappedBufferResult selectMappedBufferResult;
-    private long transfered; // the bytes which was transfered already
+
+    /** Bytes which were transferred already. */
+    private long transferred;
 
     public OneMessageTransfer(ByteBuffer byteBufferHeader, SelectMappedBufferResult selectMappedBufferResult) {
         this.byteBufferHeader = byteBufferHeader;
@@ -40,7 +42,7 @@ public long position() {
 
     @Override
     public long transfered() {
-        return transfered;
+        return transferred;
     }
 
     @Override
@@ -51,11 +53,11 @@ public long count() {
     @Override
     public long transferTo(WritableByteChannel target, long position) throws IOException {
         if (this.byteBufferHeader.hasRemaining()) {
-            transfered += target.write(this.byteBufferHeader);
-            return transfered;
+            transferred += target.write(this.byteBufferHeader);
+            return transferred;
         } else if (this.selectMappedBufferResult.getByteBuffer().hasRemaining()) {
-            transfered += target.write(this.selectMappedBufferResult.getByteBuffer());
-            return transfered;
+            transferred += target.write(this.selectMappedBufferResult.getByteBuffer());
+            return transferred;
         }
 
         return 0;
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/pagecache/QueryMessageTransfer.java b/broker/src/main/java/org/apache/rocketmq/broker/pagecache/QueryMessageTransfer.java
@@ -27,7 +27,9 @@
 public class QueryMessageTransfer extends AbstractReferenceCounted implements FileRegion {
     private final ByteBuffer byteBufferHeader;
     private final QueryMessageResult queryMessageResult;
-    private long transfered; // the bytes which was transfered already
+
+    /** Bytes which were transferred already. */
+    private long transferred;
 
     public QueryMessageTransfer(ByteBuffer byteBufferHeader, QueryMessageResult queryMessageResult) {
         this.byteBufferHeader = byteBufferHeader;
@@ -46,7 +48,7 @@ public long position() {
 
     @Override
     public long transfered() {
-        return transfered;
+        return transferred;
     }
 
     @Override
@@ -57,14 +59,14 @@ public long count() {
     @Override
     public long transferTo(WritableByteChannel target, long position) throws IOException {
         if (this.byteBufferHeader.hasRemaining()) {
-            transfered += target.write(this.byteBufferHeader);
-            return transfered;
+            transferred += target.write(this.byteBufferHeader);
+            return transferred;
         } else {
             List<ByteBuffer> messageBufferList = this.queryMessageResult.getMessageBufferList();
             for (ByteBuffer bb : messageBufferList) {
                 if (bb.hasRemaining()) {
-                    transfered += target.write(bb);
-                    return transfered;
+                    transferred += target.write(bb);
+                    return transferred;
                 }
             }
         }
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
@@ -214,7 +214,7 @@ protected RemotingCommand msgCheck(final ChannelHandlerContext ctx,
         int queueIdInt = requestHeader.getQueueId();
         int idValid = Math.max(topicConfig.getWriteQueueNums(), topicConfig.getReadQueueNums());
         if (queueIdInt >= idValid) {
-            String errorInfo = String.format("request queueId[%d] is illagal, %s Producer: %s",
+            String errorInfo = String.format("request queueId[%d] is illegal, %s Producer: %s",
                 queueIdInt,
                 topicConfig.toString(),
                 RemotingHelper.parseChannelRemoteAddr(ctx.channel()));
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java
@@ -157,7 +157,7 @@ public RemotingCommand processRequest(ChannelHandlerContext ctx, RemotingCommand
                     // Failed
                     case CREATE_MAPEDFILE_FAILED:
                         response.setCode(ResponseCode.SYSTEM_ERROR);
-                        response.setRemark("create maped file failed.");
+                        response.setRemark("create mapped file failed.");
                         break;
                     case MESSAGE_ILLEGAL:
                     case PROPERTIES_SIZE_EXCEEDED:
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
@@ -133,7 +133,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re
         }
 
         if (requestHeader.getQueueId() < 0 || requestHeader.getQueueId() >= topicConfig.getReadQueueNums()) {
-            String errorInfo = String.format("queueId[%d] is illagal, topic:[%s] topicConfig.readQueueNums:[%d] consumer:[%s]",
+            String errorInfo = String.format("queueId[%d] is illegal, topic:[%s] topicConfig.readQueueNums:[%d] consumer:[%s]",
                     requestHeader.getQueueId(), requestHeader.getTopic(), topicConfig.getReadQueueNums(), channel.remoteAddress());
             LOG.warn(errorInfo);
             response.setCode(ResponseCode.SYSTEM_ERROR);
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/transaction/jdbc/JDBCTransactionStore.java b/broker/src/main/java/org/apache/rocketmq/broker/transaction/jdbc/JDBCTransactionStore.java
@@ -63,7 +63,7 @@ public boolean open() {
 
                 return true;
             } catch (SQLException e) {
-                log.info("Create JDBC Connection Exeption", e);
+                log.info("Create JDBC Connection Exception", e);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`if (requestHeader.getQueueId() < 0 \|\| requestHeader.getQueueId() >= topicConfig.getReadQueueNums()) {`
`136`		`- String errorInfo = String.format("queueId[%d] is illagal, topic:[%s] topicConfig.readQueueNums:[%d] consumer:[%s]",`
	`136`	`+ String errorInfo = String.format("queueId[%d] is illegal, topic:[%s] topicConfig.readQueueNums:[%d] consumer:[%s]",`
`137`	`137`	`requestHeader.getQueueId(), requestHeader.getTopic(), topicConfig.getReadQueueNums(), channel.remoteAddress());`
`138`	`138`	`LOG.warn(errorInfo);`
`139`	`139`	`response.setCode(ResponseCode.SYSTEM_ERROR);`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public boolean open() {`
`63`	`63`
`64`	`64`	`return true;`
`65`	`65`	`} catch (SQLException e) {`
`66`		`- log.info("Create JDBC Connection Exeption", e);`
	`66`	`+ log.info("Create JDBC Connection Exception", e);`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`