You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2015/05/21 12:00:01 UTC
svn commit: r1680799 - in
/tomcat/trunk/java/org/apache/catalina/tribes/util: Arrays.java
ExecutorFactory.java LocalStrings.properties UUIDGenerator.java
Author: kfujino
Date: Thu May 21 10:00:01 2015
New Revision: 1680799
URL: http://svn.apache.org/r1680799
Log:
Use StringManager to provide i18n support in the org.apache.catalina.tribes.util package.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java
tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java?rev=1680799&r1=1680798&r2=1680799&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java Thu May 21 10:00:01 2015
@@ -31,11 +31,12 @@ import org.apache.catalina.tribes.member
* @version 1.0
*/
public class Arrays {
+ protected static final StringManager sm = StringManager.getManager(Arrays.class);
public static boolean contains(byte[] source, int srcoffset, byte[] key, int keyoffset, int length) {
- if ( srcoffset < 0 || srcoffset >= source.length) throw new ArrayIndexOutOfBoundsException("srcoffset is out of bounds.");
- if ( keyoffset < 0 || keyoffset >= key.length) throw new ArrayIndexOutOfBoundsException("keyoffset is out of bounds.");
- if ( length > (key.length-keyoffset) ) throw new ArrayIndexOutOfBoundsException("not enough data elements in the key, length is out of bounds.");
+ if ( srcoffset < 0 || srcoffset >= source.length) throw new ArrayIndexOutOfBoundsException(sm.getString("arrays.srcoffset.outOfBounds"));
+ if ( keyoffset < 0 || keyoffset >= key.length) throw new ArrayIndexOutOfBoundsException(sm.getString("arrays.keyoffset.outOfBounds"));
+ if ( length > (key.length-keyoffset) ) throw new ArrayIndexOutOfBoundsException(sm.getString("arrays.length.outOfBounds"));
//we don't have enough data to validate it
if ( length > (source.length-srcoffset) ) return false;
boolean match = true;
@@ -203,7 +204,7 @@ public class Arrays {
public static byte[] fromString(String value) {
if ( value == null ) return null;
- if ( !value.startsWith("{") ) throw new RuntimeException("byte arrays must be represented as {1,3,4,5,6}");
+ if ( !value.startsWith("{") ) throw new RuntimeException(sm.getString("arrays.malformed.arrays"));
StringTokenizer t = new StringTokenizer(value,"{,}",false);
byte[] result = new byte[t.countTokens()];
for (int i=0; i<result.length; i++ ) result[i] = Byte.parseByte(t.nextToken());
Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java?rev=1680799&r1=1680798&r2=1680799&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java Thu May 21 10:00:01 2015
@@ -27,6 +27,7 @@ import java.util.concurrent.ThreadPoolEx
import java.util.concurrent.TimeUnit;
public class ExecutorFactory {
+ protected static final StringManager sm = StringManager.getManager(ExecutorFactory.class);
public static ExecutorService newThreadPool(int minThreads, int maxThreads, long maxIdleTime, TimeUnit unit) {
TaskQueue taskqueue = new TaskQueue();
@@ -69,7 +70,7 @@ public class ExecutorFactory {
if (super.getQueue() instanceof TaskQueue) {
TaskQueue queue = (TaskQueue)super.getQueue();
if (!queue.force(command)) {
- throw new RejectedExecutionException("Queue capacity is full.");
+ throw new RejectedExecutionException(sm.getString("executorFactory.queue.full"));
}
}
}
@@ -91,7 +92,7 @@ public class ExecutorFactory {
}
public boolean force(Runnable o) {
- if ( parent.isShutdown() ) throw new RejectedExecutionException("Executor not running, can't force a command into the queue");
+ if ( parent.isShutdown() ) throw new RejectedExecutionException(sm.getString("executorFactory.not.running"));
return super.offer(o); //forces the item onto the queue, to be used if the task is rejected
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties?rev=1680799&r1=1680798&r2=1680799&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties Thu May 21 10:00:01 2015
@@ -13,4 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+arrays.srcoffset.outOfBounds=srcoffset is out of bounds.
+arrays.keyoffset.outOfBounds=keyoffset is out of bounds.
+arrays.length.outOfBounds=not enough data elements in the key, length is out of bounds.
+arrays.malformed.arrays=byte arrays must be represented as {1,3,4,5,6}
+executorFactory.queue.full=Queue capacity is full.
+executorFactory.not.running=Executor not running, can't force a command into the queues
uuidGenerator.createRandom=Creation of SecureRandom instance for UUID generation using [{0}] took [{1}] milliseconds.
+uuidGenerator.unable.fit=Unable to fit {0} bytes into the array. length:{1} required length:{2}
\ No newline at end of file
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=1680799&r1=1680798&r2=1680799&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java Thu May 21 10:00:01 2015
@@ -58,7 +58,7 @@ public class UUIDGenerator {
public static byte[] randomUUID(boolean secure, byte[] into, int offset) {
if ( (offset+UUID_LENGTH)>into.length )
- throw new ArrayIndexOutOfBoundsException("Unable to fit "+UUID_LENGTH+" bytes into the array. length:"+into.length+" required length:"+(offset+UUID_LENGTH));
+ throw new ArrayIndexOutOfBoundsException(sm.getString("uuidGenerator.unable.fit", UUID_LENGTH, into.length, (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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org