Merge conflicts from jnats-0.4.1

Author: Larry McQueary

pom.xml

@@ -14,7 +14,6 @@
 	<groupId>io.nats</groupId>
 	<artifactId>jnats</artifactId>
 	<version>0.5.0-SNAPSHOT</version>
-
 	<name>jnats</name>
 	<description>Java client library for NATS Messaging System</description>
 	<url>https://github.com/nats-io/jnats</url>
@@ -349,7 +348,7 @@
 		<profile>
 			<id>ossrh</id>
 			<properties>
-				<gpg.executable>gpg</gpg.executable>
+				<gpg.executable>gpg2</gpg.executable>
 				<gpg.keyname>${env.GPG_KEYNAME}</gpg.keyname>
 				<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
 				<gpg.defaultKeyring>false</gpg.defaultKeyring>

src/main/java/io/nats/client/ConnectionImpl.java

@@ -21,6 +21,8 @@
 import static io.nats.client.Constants.ERR_TIMEOUT;
 import static io.nats.client.Constants.TLS_SCHEME;
 
+import io.nats.client.Constants.ConnState;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,8 +57,6 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import io.nats.client.Constants.ConnState;
-
 class ConnectionImpl implements Connection {
     final Logger logger = LoggerFactory.getLogger(ConnectionImpl.class);
 
@@ -1994,16 +1994,10 @@ void _publish(byte[] subject, byte[] reply, byte[] data) throws IOException {
                 }
             }
 
-            // int pubProtoLen;
             // write our pubProtoBuf buffer to the buffered writer.
             try {
-                // pubProtoLen = writePublishProto(pubProtoBuf, subject,
-                // reply, msgSize);
                 writePublishProto(pubProtoBuf, subject, reply, msgSize);
             } catch (BufferOverflowException e) {
-                // logger.trace("Overflowed buffer, buffer={}, subject.length={}, reply.length={}",
-                // pubProtoBuf, subject.length, reply.length);
-
                 // We can get here if we have very large subjects.
                 // Expand with some room to spare.
                 int resizeAmount = Parser.MAX_CONTROL_LINE_SIZE + subject.length
@@ -2012,19 +2006,14 @@ void _publish(byte[] subject, byte[] reply, byte[] data) throws IOException {
                 buildPublishProtocolBuffer(resizeAmount);
 
                 writePublishProto(pubProtoBuf, subject, reply, msgSize);
-
-                // pubProtoLen = writePublishProto(pubProtoBuf, subject,
-                // reply, msgSize);
             }
 
             try {
                 bw.write(pubProtoBuf.array(), 0, pubProtoBuf.position());
                 pubProtoBuf.position(pubPrimBytesLen);
-                logger.trace("=> {}", new String(pubProtoBuf.array()).trim());
 
                 if (msgSize > 0) {
                     bw.write(data, 0, msgSize);
-                    // logger.trace("=> {}", new String(data, 0, msgSize).trim() );
                 }
 
                 bw.write(crlfProtoBytes, 0, crlfProtoBytesLen);
@@ -2037,9 +2026,6 @@ void _publish(byte[] subject, byte[] reply, byte[] data) throws IOException {
 
             stats.incrementOutMsgs();
             stats.incrementOutBytes(msgSize);
-
-            // logger.trace("Successfully published to {}",
-            // subject);
         } finally {
             mu.unlock();
         }