Author: markt
Date: Tue May 26 07:46:17 2015
New Revision: 1681697
URL: http://svn.apache.org/r1681697
Log:
Auto-boxing warnings
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Tue May 26 07:46:17 2015
@@ -142,7 +142,8 @@ public class ChannelCoordinator extends
if (svc == 0 ) return;//nothing to start
if (svc == (svc & startLevel)) {
- throw new
ChannelException(sm.getString("channelCoordinator.alreadyStarted", svc));
+ throw new
ChannelException(sm.getString("channelCoordinator.alreadyStarted",
+ Integer.toString(svc)));
}
//must start the receiver first so that we can coordinate the port
it
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Tue May 26 07:46:17 2015
@@ -66,7 +66,7 @@ public class MessageDispatchInterceptor
return;
} else {
throw new
ChannelException(sm.getString("messageDispatchInterceptor.queue.full",
- maxQueueSize, getCurrentSize()));
+ Long.toString(maxQueueSize),
Long.toString(getCurrentSize())));
}//end if
}//end if
//add to queue
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java Tue May 26
07:46:17 2015
@@ -62,7 +62,8 @@ public class BufferPool {
if (instance == null) {
BufferPoolAPI pool = new BufferPool15Impl();
pool.setMaxSize(DEFAULT_POOL_SIZE);
- log.info(sm.getString("bufferPool.created",
DEFAULT_POOL_SIZE, pool.getClass().getName()));
+ log.info(sm.getString("bufferPool.created",
+ Integer.toString(DEFAULT_POOL_SIZE),
pool.getClass().getName()));
instance = new BufferPool(pool);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Tue May 26
07:46:17 2015
@@ -114,7 +114,8 @@ public class XByteBuffer {
public void trim(int length) {
if ( (bufSize - length) < 0 )
- throw new
ArrayIndexOutOfBoundsException(sm.getString("xByteBuffer.unableTrim", bufSize,
length));
+ throw new
ArrayIndexOutOfBoundsException(sm.getString("xByteBuffer.unableTrim",
+ Integer.toString(bufSize), Integer.toString(length)));
bufSize -= length;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Tue May 26 07:46:17 2015
@@ -488,7 +488,9 @@ public class McastService implements Mem
byte[] data = XByteBuffer.createDataPackage((ChannelData)message);
if (data.length>McastServiceImpl.MAX_PACKET_SIZE) {
- throw new
ChannelException(sm.getString("mcastService.exceed.maxPacketSize",
data.length,McastServiceImpl.MAX_PACKET_SIZE));
+ throw new
ChannelException(sm.getString("mcastService.exceed.maxPacketSize",
+ Integer.toString(data.length) ,
+ Integer.toString(McastServiceImpl.MAX_PACKET_SIZE)));
}
DatagramPacket packet = new DatagramPacket(data,0,data.length);
try {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Tue May 26 07:46:17 2015
@@ -210,7 +210,7 @@ public class McastServiceImpl {
protected void setupSocket() throws IOException {
if (mcastBindAddress != null) {
try {
- log.info(sm.getString("mcastServiceImpl.bind", address, port));
+ log.info(sm.getString("mcastServiceImpl.bind", address,
Integer.toString(port)));
socket = new MulticastSocket(new
InetSocketAddress(address,port));
} catch (BindException e) {
/*
@@ -231,14 +231,16 @@ public class McastServiceImpl {
socket.setInterface(mcastBindAddress);
} //end if
//force a so timeout so that we don't block forever
- if ( mcastSoTimeout <= 0 ) mcastSoTimeout = (int)sendFrequency;
- if(log.isInfoEnabled())
- log.info(sm.getString("mcastServiceImpl.setSoTimeout",
mcastSoTimeout));
+ if (mcastSoTimeout <= 0) mcastSoTimeout = (int)sendFrequency;
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("mcastServiceImpl.setSoTimeout",
+ Integer.toString(mcastSoTimeout)));
+ }
socket.setSoTimeout(mcastSoTimeout);
if ( mcastTTL >= 0 ) {
if(log.isInfoEnabled())
- log.info(sm.getString("mcastServiceImpl.setTTL", mcastTTL));
+ log.info(sm.getString("mcastServiceImpl.setTTL",
Integer.toString(mcastTTL)));
socket.setTimeToLive(mcastTTL);
}
}
@@ -289,10 +291,11 @@ public class McastServiceImpl {
private void waitForMembers(int level) {
long memberwait = sendFrequency*2;
if(log.isInfoEnabled())
- log.info(sm.getString("mcastServiceImpl.waitForMembers.start",
memberwait, level));
+ log.info(sm.getString("mcastServiceImpl.waitForMembers.start",
+ Long.toString(memberwait), Integer.toString(level)));
try {Thread.sleep(memberwait);}catch (InterruptedException ignore){}
if(log.isInfoEnabled())
- log.info(sm.getString("mcastServiceImpl.waitForMembers.done",
level));
+ log.info(sm.getString("mcastServiceImpl.waitForMembers.done",
Integer.toString(level)));
}
/**
@@ -343,7 +346,8 @@ public class McastServiceImpl {
socket.receive(receivePacket);
if(receivePacket.getLength() > MAX_PACKET_SIZE) {
- log.error(sm.getString("mcastServiceImpl.packet.tooLong",
receivePacket.getLength()));
+ log.error(sm.getString("mcastServiceImpl.packet.tooLong",
+ Integer.toString(receivePacket.getLength())));
} else {
byte[] data = new byte[receivePacket.getLength()];
System.arraycopy(receivePacket.getData(),
receivePacket.getOffset(), data, 0, data.length);
@@ -644,7 +648,9 @@ public class McastServiceImpl {
try {
if (!success) {
if(log.isInfoEnabled())
-
log.info(sm.getString("mcastServiceImpl.recovery.failed", ++attempt,
parent.recoverySleepTime));
+
log.info(sm.getString("mcastServiceImpl.recovery.failed",
+ Integer.toString(++attempt),
+
Long.toString(parent.recoverySleepTime)));
Thread.sleep(parent.recoverySleepTime);
}
}catch (InterruptedException ignore) {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue May 26 07:46:17 2015
@@ -239,7 +239,8 @@ public abstract class AbstractReplicated
}
long complete = System.currentTimeMillis() - start;
if (log.isInfoEnabled())
- log.info(sm.getString("abstractReplicatedMap.init.completed",
mapContextName, complete));
+ log.info(sm.getString("abstractReplicatedMap.init.completed",
+ mapContextName, Long.toString(complete)));
}
@@ -845,7 +846,8 @@ public abstract class AbstractReplicated
} //while
long complete = System.currentTimeMillis() - start;
- if (log.isInfoEnabled())
log.info(sm.getString("abstractReplicatedMap.relocate.complete", complete));
+ if (log.isInfoEnabled())
log.info(sm.getString("abstractReplicatedMap.relocate.complete",
+ Long.toString(complete)));
}
public int getNextBackupIndex() {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue
May 26 07:46:17 2015
@@ -201,7 +201,8 @@ public class ReplicatedMap<K,V> extends
} //while
long complete = System.currentTimeMillis() - start;
- if (log.isInfoEnabled())
log.info(sm.getString("replicatedMap.relocate.complete", complete));
+ if (log.isInfoEnabled())
log.info(sm.getString("replicatedMap.relocate.complete",
+ Long.toString(complete)));
}
@Override
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
Tue May 26 07:46:17 2015
@@ -39,7 +39,8 @@ public class PooledMultiSender extends P
try {
sender = (MultiPointSender)getSender();
if (sender == null) {
- ChannelException cx = new
ChannelException(sm.getString("pooledMultiSender.unable.retrieve.sender",
getMaxWait()));
+ ChannelException cx = new ChannelException(sm.getString(
+ "pooledMultiSender.unable.retrieve.sender",
Long.toString(getMaxWait())));
for (int i = 0; i < destination.length; i++)
cx.addFaultyMember(destination[i], new
NullPointerException(sm.getString("pooledMultiSender.retrieve.fail")));
throw cx;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
Tue May 26 07:46:17 2015
@@ -221,7 +221,8 @@ public class FastQueue {
} else {
if (last == null) {
ok = false;
- log.error(sm.getString("fastQueue.last.null",
size.get()));
+ log.error(sm.getString("fastQueue.last.null",
+ Integer.toString(size.get())));
} else {
last.append(element);
last = element;
@@ -231,10 +232,10 @@ public class FastQueue {
}
if (first == null) {
- log.error(sm.getString("fastQueue.first.null", size.get()));
+ log.error(sm.getString("fastQueue.first.null",
Integer.toString(size.get())));
}
if (last == null) {
- log.error(sm.getString("fastQueue.last.null.end", size.get()));
+ log.error(sm.getString("fastQueue.last.null.end",
Integer.toString(size.get())));
}
if (log.isTraceEnabled()) log.trace("FastQueue.add: add ending
with size " + size.get());
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
Tue May 26 07:46:17 2015
@@ -125,8 +125,8 @@ public class NioSender extends AbstractS
}//end if
} else {
//unknown state, should never happen
- log.warn(sm.getString("nioSender.unknown.state", ops));
- throw new IOException(sm.getString("nioSender.unknown.state",
ops));
+ log.warn(sm.getString("nioSender.unknown.state",
Integer.toString(ops)));
+ throw new IOException(sm.getString("nioSender.unknown.state",
Integer.toString(ops)));
}//end if
return false;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
Tue May 26 07:46:17 2015
@@ -96,8 +96,12 @@ public class ParallelNioSender extends A
}
if ( remaining > 0 ) {
//timeout has occurred
- ChannelException cxtimeout = new
ChannelException(sm.getString("parallelNioSender.operation.timedout",
getTimeout()));
- if ( cx==null ) cx = new
ChannelException(sm.getString("parallelNioSender.operation.timedout",
getTimeout()));
+ ChannelException cxtimeout = new ChannelException(sm.getString(
+ "parallelNioSender.operation.timedout",
Long.toString(getTimeout())));
+ if (cx == null) {
+ cx = new
ChannelException(sm.getString("parallelNioSender.operation.timedout",
+ Long.toString(getTimeout())));
+ }
for (int i=0; i<senders.length; i++ ) {
if (!senders[i].isComplete()) {
cx.addFaultyMember(senders[i].getDestination(),cxtimeout);
@@ -183,8 +187,9 @@ public class ParallelNioSender extends A
}
} else {
ChannelException cx = new ChannelException(
-
sm.getString("parallelNioSender.sendFailed.attempt", sender.getAttempt(),
maxAttempts),
- x);
+
sm.getString("parallelNioSender.sendFailed.attempt",
+ Integer.toString(sender.getAttempt()),
+ Integer.toString(maxAttempts)), x);
cx.addFaultyMember(sender.getDestination(),x);
throw cx;
}//end if
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
Tue May 26 07:46:17 2015
@@ -39,7 +39,9 @@ public class PooledParallelSender extend
if ( !connected ) throw new
ChannelException(sm.getString("pooledParallelSender.sender.disconnected"));
ParallelNioSender sender = (ParallelNioSender)getSender();
if (sender == null) {
- ChannelException cx = new
ChannelException(sm.getString("pooledParallelSender.unable.retrieveSender.timeout",
getMaxWait()));
+ ChannelException cx = new ChannelException(sm.getString(
+ "pooledParallelSender.unable.retrieveSender.timeout",
+ Long.toString(getMaxWait())));
for (int i = 0; i < destination.length; i++)
cx.addFaultyMember(destination[i], new
NullPointerException(sm.getString("pooledParallelSender.unable.retrieveSender")));
throw cx;
Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java Tue
May 26 07:46:17 2015
@@ -58,7 +58,9 @@ public class UUIDGenerator {
public static byte[] randomUUID(boolean secure, byte[] into, int offset) {
if ( (offset+UUID_LENGTH)>into.length )
- throw new
ArrayIndexOutOfBoundsException(sm.getString("uuidGenerator.unable.fit",
UUID_LENGTH, into.length, (offset+UUID_LENGTH)));
+ throw new
ArrayIndexOutOfBoundsException(sm.getString("uuidGenerator.unable.fit",
+ Integer.toString(UUID_LENGTH),
Integer.toString(into.length),
+ Integer.toString(offset+UUID_LENGTH)));
Random r = (secure&&(secrand!=null))?secrand:rand;
nextBytes(into,offset,UUID_LENGTH,r);
into[6+offset] &= 0x0F;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
