#99 fixes on 3.2 branch

betfair · Jun 5, 2015 · 13f0ad4 · 13f0ad4
1 parent 6c5057c
commit 13f0ad4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...r-client/src/main/java/com/betfair/cougar/client/socket/ClientConnectedObjectManager.java b/...r-client/src/main/java/com/betfair/cougar/client/socket/ClientConnectedObjectManager.java
@@ -254,14 +254,14 @@ public void applyDelta(IoSession session, HeapDelta payload) {
         // if we've got no record then we can't continue, and we can't really throw an exception, so just warn and ignore..
         if (heaps == null) {
             nioLogger.log(NioLogger.LoggingLevel.TRANSPORT, session, "Have no heaps registered for this client, address = %s", session.getRemoteAddress().toString());
-            LOGGER.warn("Received a connected object update, yet have no record of any subscriptions. {address={},heapId={},updateId={2}}", session.getRemoteAddress().toString(), payload.getHeapId(), payload.getUpdateId());
+            LOGGER.warn("Received a connected object update, yet have no record of any subscriptions. {address={},heapId={},updateId={}}", session.getRemoteAddress().toString(), payload.getHeapId(), payload.getUpdateId());
             return;
         }
 
         HeapState heapState = heaps.getHeapState(payload.getHeapId());
         if (heapState == null) {
             nioLogger.log(NioLogger.LoggingLevel.TRANSPORT, session, "Can't find this heap for this client, address = %s, heapId = %s", session.getRemoteAddress().toString(), payload.getHeapId());
-            LOGGER.warn("Received a connected object update, yet have no record of a subscription for this heap. {address={},heapId={},updateId={2}}", session.getRemoteAddress().toString(), payload.getHeapId(), payload.getUpdateId());
+            LOGGER.warn("Received a connected object update, yet have no record of a subscription for this heap. {address={},heapId={},updateId={}}", session.getRemoteAddress().toString(), payload.getHeapId(), payload.getUpdateId());
             return;
         }
 

diff --git a/...impl/src/main/java/com/betfair/cougar/core/impl/ev/ServiceRegisterableExecutionVenue.java b/...impl/src/main/java/com/betfair/cougar/core/impl/ev/ServiceRegisterableExecutionVenue.java
@@ -186,7 +186,7 @@ private void dumpProperties() {
             if (me.getKey().toLowerCase().contains("password")) {
             	value = "*****";
             }
-            LOGGER.info("  {} = {}{2}",
+            LOGGER.info("  {} = {}{}",
                             StringUtils.rightPad(value,longest),
                             me.getKey(),
                             value,

diff --git a/cougar-framework/cougar-util/src/main/java/com/betfair/cougar/util/monitors/JMXMonitor.java b/cougar-framework/cougar-util/src/main/java/com/betfair/cougar/util/monitors/JMXMonitor.java
@@ -134,7 +134,7 @@ public String getName() {
     public Status checkStatus() {
         if (isFailState()) {
             if (currentStatus != failState) {
-                LOGGER.warn("{} {}. Attribute {2} is unavailable or incorrect", beanName, failState, attributeName);
+                LOGGER.warn("{} {}. Attribute {} is unavailable or incorrect", beanName, failState, attributeName);
             }
             currentStatus = failState;
         } else {

diff --git a/...in/java/com/betfair/cougar/transport/impl/protocol/http/AbstractHttpCommandProcessor.java b/...in/java/com/betfair/cougar/transport/impl/protocol/http/AbstractHttpCommandProcessor.java
@@ -295,7 +295,7 @@ protected CougarException handleResponseWritingIOException(Exception e, Class re
 		//Instead a summary debug level log message with some relevant info
         incrementIoErrorsEncountered();
 		LOGGER.debug(
-				"Failed to marshall object of class {} to the output channel. Exception ({}) message is: {2}",
+				"Failed to marshall object of class {} to the output channel. Exception ({}) message is: {}",
 				resultClass.getCanonicalName(),
 				e.getClass().getCanonicalName(),
 				e.getMessage()

diff --git a/...va/com/betfair/cougar/transport/impl/protocol/http/rescript/RescriptOperationBinding.java b/...va/com/betfair/cougar/transport/impl/protocol/http/rescript/RescriptOperationBinding.java
@@ -129,7 +129,7 @@ public Object[] resolveArgs(HttpServletRequest request, InputStream inputStream,
                     default :
                         throw new PanicInTheCougar("Unsupported argument annotation "+ descriptor.getSource());
                 }
-                //request.trace("Deserialised argument {} from {} to value {2}", i, param.getSource(), args[i]);
+                //request.trace("Deserialised argument {} from {} to value {}", i, param.getSource(), args[i]);
             }
         }
         catch (EnumDerialisationException ede) {