Author: markt
Date: Mon Jul 27 10:44:41 2015
New Revision: 1692866
URL: http://svn.apache.org/r1692866
Log:
Auto-boxing warnings
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 27 10:44:41 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891,1687268,168734
0,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891,168726
8,1687340,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Mon Jul 27 10:44:41 2015
@@ -143,7 +143,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Mon Jul 27 10:44:41 2015
@@ -67,7 +67,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool.java Mon
Jul 27 10:44:41 2015
@@ -63,7 +63,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
Mon Jul 27 10:44:41 2015
@@ -116,7 +116,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Mon Jul 27 10:44:41 2015
@@ -487,7 +487,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Mon Jul 27 10:44:41 2015
@@ -211,7 +211,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) {
/*
@@ -232,14 +232,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);
}
}
@@ -290,10 +292,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)));
}
/**
@@ -344,7 +347,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);
@@ -645,7 +649,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Mon Jul 27 10:44:41 2015
@@ -240,7 +240,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)));
}
@@ -846,7 +847,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Mon Jul 27 10:44:41 2015
@@ -227,7 +227,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
Mon Jul 27 10:44:41 2015
@@ -40,7 +40,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
Mon Jul 27 10:44:41 2015
@@ -222,7 +222,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;
@@ -232,10 +233,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
Mon Jul 27 10:44:41 2015
@@ -126,8 +126,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
Mon Jul 27 10:44:41 2015
@@ -102,8 +102,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);
@@ -189,8 +193,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
Mon Jul 27 10:44:41 2015
@@ -40,7 +40,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java?rev=1692866&r1=1692865&r2=1692866&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
Mon Jul 27 10:44:41 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
