You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2013/12/10 13:54:55 UTC
svn commit: r1549829 - in
/tomee/tomee/trunk/container/openejb-core/src/main: config/
java/org/apache/openejb/assembler/classic/ java/org/apache/openejb/config/
java/org/apache/openejb/config/sys/
java/org/apache/openejb/core/ivm/naming/ java/org/apach...
Author: tveronezi
Date: Tue Dec 10 12:54:54 2013
New Revision: 1549829
URL: http://svn.apache.org/r1549829
Log:
https://issues.apache.org/jira/browse/OPENEJB-2062
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ScanUtil.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/AbstractDelegatingLogger.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SafeToolkit.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml Tue Dec 10 12:54:54 2013
@@ -143,7 +143,7 @@
<!-- Miscellaneous other checks. -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
- <!--<module name="ArrayTypeStyle"/>-->
+ <module name="ArrayTypeStyle"/>
<!--<module name="TodoComment"/>-->
<!--<module name="UpperEll"/>-->
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java Tue Dec 10 12:54:54 2013
@@ -272,7 +272,7 @@ public class DeployTimeEnhancer {
}
@Override
- public void characters(final char ch[], final int start, final int length) throws SAXException {
+ public void characters(final char[] ch, final int start, final int length) throws SAXException {
if (getIt) {
paths.add(String.valueOf(ch, start, length));
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ScanUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ScanUtil.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ScanUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ScanUtil.java Tue Dec 10 12:54:54 2013
@@ -59,7 +59,7 @@ public final class ScanUtil {
}
@Override
- public void characters(char ch[], int start, int length) throws SAXException {
+ public void characters(char[] ch, int start, int length) throws SAXException {
if (current != null) {
current.add(new String(ch, start, length));
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java Tue Dec 10 12:54:54 2013
@@ -436,7 +436,7 @@ public abstract class JaxbOpenejb {
servicesJar.getServiceProvider().add(provider);
}
- public void characters(char ch[], int start, int length) throws SAXException {
+ public void characters(char[] ch, int start, int length) throws SAXException {
if (content == null) content = new StringBuilder();
content.append(ch, start, length);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java Tue Dec 10 12:54:54 2013
@@ -108,7 +108,7 @@ public class StackHandler extends Defaul
characters = new StringBuilder();
}
- public void characters(char ch[], int start, int length) {
+ public void characters(char[] ch, int start, int length) {
characters.append(new String(ch, start, length));
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java Tue Dec 10 12:54:54 2013
@@ -178,7 +178,7 @@ public class IvmContext implements Conte
}
protected Object federate(String compositName) throws NamingException {
- ObjectFactory factories [] = getFederatedFactories();
+ ObjectFactory[] factories = getFederatedFactories();
for (ObjectFactory factory : factories) {
try {
CompositeName name = new CompositeName(compositName);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/AbstractDelegatingLogger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/AbstractDelegatingLogger.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/AbstractDelegatingLogger.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/AbstractDelegatingLogger.java Tue Dec 10 12:54:54 2013
@@ -60,13 +60,13 @@ public abstract class AbstractDelegating
public void log(Level level, String msg, Object param1) {
if (isLoggable(level)) {
LogRecord lr = new LogRecord(level, msg);
- Object params[] = {param1 };
+ Object[] params = {param1 };
lr.setParameters(params);
doLog(lr);
}
}
- public void log(Level level, String msg, Object params[]) {
+ public void log(Level level, String msg, Object[] params) {
if (isLoggable(level)) {
LogRecord lr = new LogRecord(level, msg);
lr.setParameters(params);
@@ -96,13 +96,13 @@ public abstract class AbstractDelegating
LogRecord lr = new LogRecord(level, msg);
lr.setSourceClassName(sourceClass);
lr.setSourceMethodName(sourceMethod);
- Object params[] = {param1 };
+ Object[] params = {param1 };
lr.setParameters(params);
doLog(lr);
}
}
- public void logp(Level level, String sourceClass, String sourceMethod, String msg, Object params[]) {
+ public void logp(Level level, String sourceClass, String sourceMethod, String msg, Object[] params) {
if (isLoggable(level)) {
LogRecord lr = new LogRecord(level, msg);
lr.setSourceClassName(sourceClass);
@@ -137,14 +137,14 @@ public abstract class AbstractDelegating
LogRecord lr = new LogRecord(level, msg);
lr.setSourceClassName(sourceClass);
lr.setSourceMethodName(sourceMethod);
- Object params[] = {param1 };
+ Object[] params = {param1 };
lr.setParameters(params);
doLog(lr, bundleName);
}
}
public void logrb(Level level, String sourceClass, String sourceMethod,
- String bundleName, String msg, Object params[]) {
+ String bundleName, String msg, Object[] params) {
if (isLoggable(level)) {
LogRecord lr = new LogRecord(level, msg);
lr.setSourceClassName(sourceClass);
@@ -173,12 +173,12 @@ public abstract class AbstractDelegating
public void entering(String sourceClass, String sourceMethod, Object param1) {
if (isLoggable(Level.FINER)) {
- Object params[] = {param1 };
+ Object[] params = { param1 };
logp(Level.FINER, sourceClass, sourceMethod, "ENTRY {0}", params);
}
}
- public void entering(String sourceClass, String sourceMethod, Object params[]) {
+ public void entering(String sourceClass, String sourceMethod, Object[] params) {
if (isLoggable(Level.FINER)) {
String msg = "ENTRY";
if (params == null) {
@@ -203,7 +203,7 @@ public abstract class AbstractDelegating
public void exiting(String sourceClass, String sourceMethod, Object result) {
if (isLoggable(Level.FINER)) {
- Object params[] = {result };
+ Object[] params = { result };
logp(Level.FINER, sourceClass, sourceMethod, "RETURN {0}", params);
}
}
@@ -369,7 +369,7 @@ public abstract class AbstractDelegating
}
}
try {
- Object parameters[] = record.getParameters();
+ Object[] parameters = record.getParameters();
if (parameters == null || parameters.length == 0) {
return format;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java Tue Dec 10 12:54:54 2013
@@ -112,7 +112,7 @@ public class Slf4jLogger extends Abstrac
Level level = record.getLevel();
Throwable t = record.getThrown();
- Handler targets[] = getHandlers();
+ Handler[] targets = getHandlers();
if (targets != null) {
for (Handler h : targets) {
h.publish(record);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java Tue Dec 10 12:54:54 2013
@@ -281,7 +281,7 @@ public class PersistenceBootstrap {
unit = new Unit(unitName);
}
- public void characters(char ch[], int start, int length) {
+ public void characters(char[] ch, int start, int length) {
String text = new String(ch, start, length);
characters.append(text.trim());
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java Tue Dec 10 12:54:54 2013
@@ -252,8 +252,8 @@ public class Base64 {
int lengthDataBits = binaryData.length * EIGHTBIT;
int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
- byte encodedData[] = null;
- int encodedDataLength = 0;
+ byte[] encodedData;
+ int encodedDataLength;
int nbrChunks = 0;
if (fewerThan24bits != 0) {
@@ -398,7 +398,7 @@ public class Base64 {
}
int numberQuadruple = base64Data.length / FOURBYTE;
- byte decodedData[] = null;
+ byte[] decodedData;
byte b1 = 0, b2 = 0, b3 = 0, b4 = 0, marker0 = 0, marker1 = 0;
// Throw away anything not in base64Data
@@ -458,7 +458,7 @@ public class Base64 {
* @return The data, less whitespace (see RFC 2045).
*/
static byte[] discardWhitespace(byte[] data) {
- byte groomedData[] = new byte[data.length];
+ byte[] groomedData = new byte[data.length];
int bytesCopied = 0;
for (int i = 0; i < data.length; i++) {
@@ -473,7 +473,7 @@ public class Base64 {
}
}
- byte packedData[] = new byte[bytesCopied];
+ byte[] packedData = new byte[bytesCopied];
System.arraycopy(groomedData, 0, packedData, 0, bytesCopied);
@@ -490,7 +490,7 @@ public class Base64 {
* @return The data, less non-base64 characters (see RFC 2045).
*/
static byte[] discardNonBase64(byte[] data) {
- byte groomedData[] = new byte[data.length];
+ byte[] groomedData = new byte[data.length];
int bytesCopied = 0;
for (int i = 0; i < data.length; i++) {
@@ -499,7 +499,7 @@ public class Base64 {
}
}
- byte packedData[] = new byte[bytesCopied];
+ byte[] packedData = new byte[bytesCopied];
System.arraycopy(groomedData, 0, packedData, 0, bytesCopied);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java Tue Dec 10 12:54:54 2013
@@ -159,7 +159,7 @@ public class Index<K,V> extends Abstract
public interface ListSet extends List, Set {
}
- public Object[] toArray(Object values[]) {
+ public Object[] toArray(Object[] values) {
if (values.length < entries.length) {
values = (Object[]) Array.newInstance(values.getClass().getComponentType(), entries.length);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java Tue Dec 10 12:54:54 2013
@@ -52,7 +52,7 @@ public class IntrospectionSupport {
Method method = methods[i];
String name = method.getName();
Class type = method.getReturnType();
- Class params[] = method.getParameterTypes();
+ Class[] params = method.getParameterTypes();
if (name.startsWith("get") && params.length == 0 && type != null
&& isSettableType(type)) {
@@ -196,7 +196,7 @@ public class IntrospectionSupport {
Method[] methods = clazz.getMethods();
for (int i = 0; i < methods.length; i++) {
Method method = methods[i];
- Class params[] = method.getParameterTypes();
+ Class[] params = method.getParameterTypes();
if (method.getName().equals(name) && params.length == 1
&& isSettableType(params[0])) {
return method;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java Tue Dec 10 12:54:54 2013
@@ -124,7 +124,7 @@ public class JarExtractor {
boolean result = true;
- String files[];
+ String[] files;
if (src.isDirectory()) {
files = src.list();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SafeToolkit.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SafeToolkit.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SafeToolkit.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SafeToolkit.java Tue Dec 10 12:54:54 2013
@@ -76,7 +76,7 @@ public final class SafeToolkit {
private static String getCodebase(URLClassLoader urlClassLoader) {
StringBuilder codebase = new StringBuilder();
- URL urlList[] = urlClassLoader.getURLs();
+ URL[] urlList = urlClassLoader.getURLs();
codebase.append(urlList[0].toString());
for (int i = 1; i < urlList.length; ++i) {
codebase.append(';');
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java?rev=1549829&r1=1549828&r2=1549829&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java Tue Dec 10 12:54:54 2013
@@ -91,7 +91,7 @@ public class URISupport {
public static class CompositeData {
String scheme;
String path;
- URI components[];
+ URI[] components;
Map parameters;
String fragment;
public String host;
@@ -228,7 +228,7 @@ public class URISupport {
params="";
}
- String components[] = splitComponents(componentString);
+ String[] components = splitComponents(componentString);
rc.components=new URI[components.length];
for (int i = 0; i < components.length; i++) {
rc.components[i] = new URI(components[i].trim());
@@ -252,7 +252,7 @@ public class URISupport {
int last=0;
int depth = 0;
- char chars[] = str.toCharArray();
+ char[] chars = str.toCharArray();
for( int i=0; i < chars.length; i ++ ) {
switch( chars[i] ) {
case '(':
@@ -274,7 +274,7 @@ public class URISupport {
if( s.length() !=0 )
l.add(s);
- String rc[] = new String[l.size()];
+ String[] rc = new String[l.size()];
l.toArray(rc);
return rc;
}