You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gearpump.apache.org by ma...@apache.org on 2016/09/06 11:08:34 UTC
incubator-gearpump git commit: [GEARPUMP-171] Fix some typos
Repository: incubator-gearpump
Updated Branches:
refs/heads/master 584a2ca23 -> 6852b56e9
[GEARPUMP-171] Fix some typos
[GEARPUMP-171](https://issues.apache.org/jira/browse/GEARPUMP-171)
Fix some typos
Author: darionyaphet <da...@gmail.com>
Closes #55 from darionyaphet/typos.
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/6852b56e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/6852b56e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/6852b56e
Branch: refs/heads/master
Commit: 6852b56e950dcf03635655abdf4f6d1dd665386c
Parents: 584a2ca
Author: darionyaphet <da...@gmail.com>
Authored: Tue Sep 6 19:08:24 2016 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Tue Sep 6 19:08:24 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/gearpump/transport/netty/MessageDecoder.java | 4 ++--
.../scala/org/apache/gearpump/cluster/master/MasterProxy.scala | 2 +-
.../main/scala/org/apache/gearpump/services/main/Services.scala | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/6852b56e/core/src/main/java/org/apache/gearpump/transport/netty/MessageDecoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/gearpump/transport/netty/MessageDecoder.java b/core/src/main/java/org/apache/gearpump/transport/netty/MessageDecoder.java
index 761bb38..d4d8c37 100644
--- a/core/src/main/java/org/apache/gearpump/transport/netty/MessageDecoder.java
+++ b/core/src/main/java/org/apache/gearpump/transport/netty/MessageDecoder.java
@@ -46,11 +46,11 @@ public class MessageDecoder extends FrameDecoder {
ChannelBuffer buf) {
this.dataInput.setChannelBuffer(buf);
- final int SESION_LENGTH = 4; //int
+ final int SESSION_LENGTH = 4; //int
final int SOURCE_TASK_LENGTH = 8; //long
final int TARGET_TASK_LENGTH = 8; //long
final int MESSAGE_LENGTH = 4; //int
- final int HEADER_LENGTH = SESION_LENGTH + SOURCE_TASK_LENGTH + TARGET_TASK_LENGTH + MESSAGE_LENGTH;
+ final int HEADER_LENGTH = SESSION_LENGTH + SOURCE_TASK_LENGTH + TARGET_TASK_LENGTH + MESSAGE_LENGTH;
// Make sure that we have received at least a short message
long available = buf.readableBytes();
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/6852b56e/core/src/main/scala/org/apache/gearpump/cluster/master/MasterProxy.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/cluster/master/MasterProxy.scala b/core/src/main/scala/org/apache/gearpump/cluster/master/MasterProxy.scala
index e2ee00e..2546ae0 100644
--- a/core/src/main/scala/org/apache/gearpump/cluster/master/MasterProxy.scala
+++ b/core/src/main/scala/org/apache/gearpump/cluster/master/MasterProxy.scala
@@ -85,7 +85,7 @@ class MasterProxy(masters: Iterable[ActorPath], timeout: FiniteDuration)
def active(receptionist: ActorRef): Actor.Receive = {
case Terminated(receptionist) =>
- LOG.info("Lost contact with [{}], restablishing connection", receptionist)
+ LOG.info("Lost contact with [{}], reestablishing connection", receptionist)
context.become(establishing(findMaster))
case _: ActorIdentity => // ok, from previous establish, already handled
case WatchMaster(watcher) =>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/6852b56e/services/jvm/src/main/scala/org/apache/gearpump/services/main/Services.scala
----------------------------------------------------------------------
diff --git a/services/jvm/src/main/scala/org/apache/gearpump/services/main/Services.scala b/services/jvm/src/main/scala/org/apache/gearpump/services/main/Services.scala
index 23c95c4..26b98dc 100644
--- a/services/jvm/src/main/scala/org/apache/gearpump/services/main/Services.scala
+++ b/services/jvm/src/main/scala/org/apache/gearpump/services/main/Services.scala
@@ -127,8 +127,8 @@ object Services extends AkkaApp with ArgumentsParser {
val length = 64 // Required
val bytes = new Array[Byte](length)
random.nextBytes(bytes)
- val endecoder = new BASE64Encoder()
- endecoder.encode(bytes)
+ val encoder = new BASE64Encoder()
+ encoder.encode(bytes)
}
private def parseHostPort(config: Config): (String, Int) = {