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 2014/02/22 02:58:23 UTC
svn commit: r1570779 [6/7] - in
/tomee/tomee/trunk/container/openejb-core/src/main: config/
java/org/apache/openejb/ java/org/apache/openejb/assembler/classic/
java/org/apache/openejb/assembler/classic/cmd/
java/org/apache/openejb/bval/ java/org/apache...
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java Sat Feb 22 01:58:19 2014
@@ -343,10 +343,18 @@ public class PersistenceUnitInfoImpl imp
}
}
- if (name.startsWith("java.")) return true;
- if (name.startsWith("javax.")) return true;
- if (name.startsWith("sun.")) return true;
- if (name.startsWith("com.sun.")) return true;
+ if (name.startsWith("java.")) {
+ return true;
+ }
+ if (name.startsWith("javax.")) {
+ return true;
+ }
+ if (name.startsWith("sun.")) {
+ return true;
+ }
+ if (name.startsWith("com.sun.")) {
+ return true;
+ }
if (name.startsWith("org.")) {
final String org = name.substring("org.".length());
@@ -354,44 +362,110 @@ public class PersistenceUnitInfoImpl imp
if (org.startsWith("apache.")) {
final String apache = org.substring("apache.".length());
- if (apache.startsWith("bval.")) return true;
- if (apache.startsWith("openjpa.")) return true;
- if (apache.startsWith("derby.")) return true;
- if (apache.startsWith("xbean.")) return true;
- if (apache.startsWith("geronimo.")) return true;
- if (apache.startsWith("coyote")) return true;
- if (apache.startsWith("webbeans.")) return true;
- if (apache.startsWith("log4j")) return true;
- if (apache.startsWith("catalina")) return true;
- if (apache.startsWith("jasper.")) return true;
- if (apache.startsWith("tomcat.")) return true;
- if (apache.startsWith("el.")) return true;
- if (apache.startsWith("jsp")) return true;
- if (apache.startsWith("naming")) return true;
- if (apache.startsWith("taglibs.")) return true;
- if (apache.startsWith("openejb.")) return true;
- if (apache.startsWith("openjpa.")) return true;
- if (apache.startsWith("myfaces.")) return true;
- if (apache.startsWith("juli.")) return true;
- if (apache.startsWith("webbeans.")) return true;
- if (apache.startsWith("cxf.")) return true;
- if (apache.startsWith("activemq.")) return true;
+ if (apache.startsWith("bval.")) {
+ return true;
+ }
+ if (apache.startsWith("openjpa.")) {
+ return true;
+ }
+ if (apache.startsWith("derby.")) {
+ return true;
+ }
+ if (apache.startsWith("xbean.")) {
+ return true;
+ }
+ if (apache.startsWith("geronimo.")) {
+ return true;
+ }
+ if (apache.startsWith("coyote")) {
+ return true;
+ }
+ if (apache.startsWith("webbeans.")) {
+ return true;
+ }
+ if (apache.startsWith("log4j")) {
+ return true;
+ }
+ if (apache.startsWith("catalina")) {
+ return true;
+ }
+ if (apache.startsWith("jasper.")) {
+ return true;
+ }
+ if (apache.startsWith("tomcat.")) {
+ return true;
+ }
+ if (apache.startsWith("el.")) {
+ return true;
+ }
+ if (apache.startsWith("jsp")) {
+ return true;
+ }
+ if (apache.startsWith("naming")) {
+ return true;
+ }
+ if (apache.startsWith("taglibs.")) {
+ return true;
+ }
+ if (apache.startsWith("openejb.")) {
+ return true;
+ }
+ if (apache.startsWith("openjpa.")) {
+ return true;
+ }
+ if (apache.startsWith("myfaces.")) {
+ return true;
+ }
+ if (apache.startsWith("juli.")) {
+ return true;
+ }
+ if (apache.startsWith("webbeans.")) {
+ return true;
+ }
+ if (apache.startsWith("cxf.")) {
+ return true;
+ }
+ if (apache.startsWith("activemq.")) {
+ return true;
+ }
if (apache.startsWith("commons.")) {
final String commons = apache.substring("commons.".length());
// don't stop on commons package since we don't bring all commons
- if (commons.startsWith("beanutils")) return true;
- if (commons.startsWith("cli")) return true;
- if (commons.startsWith("codec")) return true;
- if (commons.startsWith("collections")) return true;
- if (commons.startsWith("dbcp")) return true;
- if (commons.startsWith("digester")) return true;
- if (commons.startsWith("jocl")) return true;
- if (commons.startsWith("lang")) return true;
- if (commons.startsWith("logging")) return false;
- if (commons.startsWith("pool")) return true;
- if (commons.startsWith("net")) return true;
+ if (commons.startsWith("beanutils")) {
+ return true;
+ }
+ if (commons.startsWith("cli")) {
+ return true;
+ }
+ if (commons.startsWith("codec")) {
+ return true;
+ }
+ if (commons.startsWith("collections")) {
+ return true;
+ }
+ if (commons.startsWith("dbcp")) {
+ return true;
+ }
+ if (commons.startsWith("digester")) {
+ return true;
+ }
+ if (commons.startsWith("jocl")) {
+ return true;
+ }
+ if (commons.startsWith("lang")) {
+ return true;
+ }
+ if (commons.startsWith("logging")) {
+ return false;
+ }
+ if (commons.startsWith("pool")) {
+ return true;
+ }
+ if (commons.startsWith("net")) {
+ return true;
+ }
return false;
}
@@ -400,22 +474,44 @@ public class PersistenceUnitInfoImpl imp
}
// other org packages
- if (org.startsWith("codehaus.swizzle")) return true;
- if (org.startsWith("w3c.dom")) return true;
- if (org.startsWith("quartz")) return true;
- if (org.startsWith("eclipse.jdt.")) return true;
- if (org.startsWith("slf4j")) return true;
- if (org.startsWith("openejb")) return true; // old packages
- if (org.startsWith("hsqldb")) return true; // old packages
- if (org.startsWith("hibernate")) return true; // old packages
+ if (org.startsWith("codehaus.swizzle")) {
+ return true;
+ }
+ if (org.startsWith("w3c.dom")) {
+ return true;
+ }
+ if (org.startsWith("quartz")) {
+ return true;
+ }
+ if (org.startsWith("eclipse.jdt.")) {
+ return true;
+ }
+ if (org.startsWith("slf4j")) {
+ return true;
+ }
+ if (org.startsWith("openejb")) {
+ return true; // old packages
+ }
+ if (org.startsWith("hsqldb")) {
+ return true; // old packages
+ }
+ if (org.startsWith("hibernate")) {
+ return true; // old packages
+ }
return false;
}
// other packages
- if (name.startsWith("com.sun.")) return true;
- if (name.startsWith("javassist")) return true;
- if (name.startsWith("serp.")) return true;
+ if (name.startsWith("com.sun.")) {
+ return true;
+ }
+ if (name.startsWith("javassist")) {
+ return true;
+ }
+ if (name.startsWith("serp.")) {
+ return true;
+ }
return false;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java Sat Feb 22 01:58:19 2014
@@ -84,7 +84,9 @@ public class AutoConnectionTracker imple
private void proxyConnection(final ConnectionTrackingInterceptor interceptor, final ConnectionInfo connectionInfo) throws ResourceException {
// if this connection already has a proxy no need to create another
- if (connectionInfo.getConnectionProxy() != null) return;
+ if (connectionInfo.getConnectionProxy() != null) {
+ return;
+ }
// DissociatableManagedConnection do not need to be proxied
if (connectionInfo.getManagedConnectionInfo().getManagedConnection() instanceof DissociatableManagedConnection) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java Sat Feb 22 01:58:19 2014
@@ -214,9 +214,15 @@ public class GeronimoConnectionManagerFa
final PoolingSupport poolingSupport = createPoolingSupport();
ClassLoader classLoader = this.classLoader;
- if (classLoader == null) Thread.currentThread().getContextClassLoader();
- if (classLoader == null) classLoader = getClass().getClassLoader();
- if (classLoader == null) classLoader = ClassLoader.getSystemClassLoader();
+ if (classLoader == null) {
+ Thread.currentThread().getContextClassLoader();
+ }
+ if (classLoader == null) {
+ classLoader = getClass().getClassLoader();
+ }
+ if (classLoader == null) {
+ classLoader = ClassLoader.getSystemClassLoader();
+ }
final TransactionSupport txSupport = createTransactionSupport();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java Sat Feb 22 01:58:19 2014
@@ -37,7 +37,9 @@ public final class BasicDataSourceUtil {
final String vendor = getJdbcName(jdbcUrl);
// no vendor so no plugin
- if (vendor == null) return null;
+ if (vendor == null) {
+ return null;
+ }
// find the plugin class
String pluginClassName = null;
@@ -67,7 +69,9 @@ public final class BasicDataSourceUtil {
public static String getJdbcName(String jdbcUrl) {
// nothing gets you nothing
- if (jdbcUrl == null) return null;
+ if (jdbcUrl == null) {
+ return null;
+ }
// strip off "jdbc:"
if (!jdbcUrl.startsWith("jdbc:")) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java Sat Feb 22 01:58:19 2014
@@ -36,7 +36,9 @@ public class IsolationLevels {
}
public static int getIsolationLevel(final String s) {
- if (!isolation.containsKey(s)) throw new IllegalArgumentException("No such transaction isolation level '"+s+"'. Possible values are "+Join.join(", ", isolation.keySet()));
+ if (!isolation.containsKey(s)) {
+ throw new IllegalArgumentException("No such transaction isolation level '" + s + "'. Possible values are " + Join.join(", ", isolation.keySet()));
+ }
final int level = isolation.get(s);
return level;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java Sat Feb 22 01:58:19 2014
@@ -187,7 +187,9 @@ public class BasicDataSource extends org
final ReentrantLock l = lock;
l.lock();
try {
- if (s == null || s.equals("")) return;
+ if (s == null || s.equals("")) {
+ return;
+ }
final int level = IsolationLevels.getIsolationLevel(s);
super.setDefaultTransactionIsolation(level);
} finally {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java Sat Feb 22 01:58:19 2014
@@ -190,7 +190,9 @@ public class BasicManagedDataSource exte
final ReentrantLock l = lock;
l.lock();
try {
- if (s == null || s.equals("")) return;
+ if (s == null || s.equals("")) {
+ return;
+ }
final int level = IsolationLevels.getIsolationLevel(s);
super.setDefaultTransactionIsolation(level);
} finally {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java Sat Feb 22 01:58:19 2014
@@ -64,7 +64,9 @@ public class LoggingPreparedSqlStatement
if (mtdName.startsWith("set") && args.length >= 2 && (args[0].getClass().equals(Integer.TYPE) || args[0].getClass().equals(Integer.class))) {
final Parameter param = new Parameter(mtdName.substring(3), parameterIndex, (Integer) args[0], args[1]);
- if (debug) logParam(param);
+ if (debug) {
+ logParam(param);
+ }
parameters.add(param);
} else if (execute) {
@@ -117,7 +119,9 @@ public class LoggingPreparedSqlStatement
parameterIndex++;
}
- if (result.getThrowable() != null) throw result.getThrowable();
+ if (result.getThrowable() != null) {
+ throw result.getThrowable();
+ }
return result.getResult();
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingSqlStatement.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingSqlStatement.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingSqlStatement.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingSqlStatement.java Sat Feb 22 01:58:19 2014
@@ -42,7 +42,9 @@ public class LoggingSqlStatement impleme
LOGGER.info(result.format((String) args[0]));
}
- if (result.getThrowable() != null) throw result.getThrowable();
+ if (result.getThrowable() != null) {
+ throw result.getThrowable();
+ }
return result.getResult();
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/JobSpec.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/JobSpec.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/JobSpec.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/JobSpec.java Sat Feb 22 01:58:19 2014
@@ -221,8 +221,9 @@ public final class JobSpec implements Ac
@SuppressWarnings("unchecked")
@Override
public void validate() throws InvalidPropertyException {
- if (invalidProperty != null)
+ if (invalidProperty != null) {
throw invalidProperty;
+ }
final int i = hashCode();
detail = JobBuilder.newJob(QuartzResourceAdapter.JobEndpoint.class)
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java Sat Feb 22 01:58:19 2014
@@ -220,12 +220,16 @@ public class PseudoTransactionService im
}
public Object getResource(final Object key) {
- if (key == null) throw new NullPointerException("key is null");
+ if (key == null) {
+ throw new NullPointerException("key is null");
+ }
return resources.get(key);
}
public void putResource(final Object key, final Object value) {
- if (key == null) throw new NullPointerException("key is null");
+ if (key == null) {
+ throw new NullPointerException("key is null");
+ }
if (value != null) {
resources.put(key, value);
} else {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java Sat Feb 22 01:58:19 2014
@@ -218,8 +218,9 @@ public class AnnotationFinder {
} else if (file.getName().endsWith(".class")) {
String name = file.getName();
name = name.replaceFirst(".class$", "");
- if (name.contains("."))
+ if (name.contains(".")) {
continue;
+ }
classNames.add(packageName + name);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java Sat Feb 22 01:58:19 2014
@@ -59,7 +59,9 @@ public class Classes {
Class clazz = primitives.get(string);
- if (clazz == null) clazz = Class.forName(string, true, classLoader);
+ if (clazz == null) {
+ clazz = Class.forName(string, true, classLoader);
+ }
if (arrayDimentions == 0){
return clazz;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java Sat Feb 22 01:58:19 2014
@@ -35,7 +35,9 @@ public class ConfUtils {
public static URL getConfResource(final String name) {
URL resource = getResource(name);
- if (!EnvProps.extractConfigurationFiles()) return resource;
+ if (!EnvProps.extractConfigurationFiles()) {
+ return resource;
+ }
try {
@@ -66,10 +68,16 @@ public class ConfUtils {
}
private static URL select(final Enumeration<URL> enumeration) {
- if (enumeration == null) return null;
+ if (enumeration == null) {
+ return null;
+ }
final ArrayList<URL> urls = Collections.list(enumeration);
- if (urls.size() == 0) return null;
- if (urls.size() == 1) return urls.get(0);
+ if (urls.size() == 0) {
+ return null;
+ }
+ if (urls.size() == 1) {
+ return urls.get(0);
+ }
// Sort so that the URL closest to openejb.base is first
Collections.sort(urls, new UrlComparator(SystemInstance.get().getBase().getDirectory()));
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/CountingLatch.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/CountingLatch.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/CountingLatch.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/CountingLatch.java Sat Feb 22 01:58:19 2014
@@ -65,7 +65,9 @@ public class CountingLatch {
final int next = count + releases;
- if (next < 0) return false;
+ if (next < 0) {
+ return false;
+ }
if (compareAndSetState(count, next)) {
return next == 0;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Debug.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Debug.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Debug.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Debug.java Sat Feb 22 01:58:19 2014
@@ -96,7 +96,9 @@ public class Debug {
}
public static List<Field> getFields(final Class clazz){
- if (clazz == null) return Collections.EMPTY_LIST;
+ if (clazz == null) {
+ return Collections.EMPTY_LIST;
+ }
final List<Field> fields = new ArrayList<Field>();
@@ -168,8 +170,12 @@ public class Debug {
final Iterator<StackTraceElement> iterator = stackTraceElements.iterator();
while (iterator.hasNext()) {
final StackTraceElement element = iterator.next();
- if (!element.getClassName().startsWith("org.apache")) iterator.remove();
- if (element.getClassName().endsWith("Debug") && element.getMethodName().equals("mark")) iterator.remove();
+ if (!element.getClassName().startsWith("org.apache")) {
+ iterator.remove();
+ }
+ if (element.getClassName().endsWith("Debug") && element.getMethodName().equals("mark")) {
+ iterator.remove();
+ }
}
trace.link(stackTraceElements);
@@ -188,7 +194,9 @@ public class Debug {
}
private void print(final Set<Node> seen, final PrintStream out, final Node node, final String s) {
- if (!seen.add(node)) return;
+ if (!seen.add(node)) {
+ return;
+ }
out.print("<li>\n");
@@ -211,7 +219,9 @@ public class Debug {
}
private void printTxt(final Set<Node> seen, final PrintStream out, final Node node, String s) {
- if (!seen.add(node)) return;
+ if (!seen.add(node)) {
+ return;
+ }
out.print(s);
final StackTraceElement e = node.getElement();
@@ -272,7 +282,9 @@ public class Debug {
public void link(final List<StackTraceElement> elements) {
events.add(new Event(elements));
final Iterator<StackTraceElement> iterator = elements.iterator();
- if (!iterator.hasNext()) return;
+ if (!iterator.hasNext()) {
+ return;
+ }
Node parent = get(iterator.next());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java Sat Feb 22 01:58:19 2014
@@ -126,18 +126,30 @@ public class Duration {
}
private static TimeUnit lowest(final Duration a, final Duration b) {
- if (a.unit == null) return b.unit;
- if (b.unit == null) return a.unit;
- if (a.time == 0) return b.unit;
- if (b.time == 0) return a.unit;
+ if (a.unit == null) {
+ return b.unit;
+ }
+ if (b.unit == null) {
+ return a.unit;
+ }
+ if (a.time == 0) {
+ return b.unit;
+ }
+ if (b.time == 0) {
+ return a.unit;
+ }
return TimeUnit.values()[Math.min(a.unit.ordinal(), b.unit.ordinal())];
}
}
@Override
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final Duration that = (Duration) o;
@@ -175,44 +187,106 @@ public class Duration {
}
private static TimeUnit parseUnit(final String u) {
- if (u.length() == 0) return null;
+ if (u.length() == 0) {
+ return null;
+ }
+
+ if (u.equalsIgnoreCase("NANOSECONDS")) {
+ return TimeUnit.NANOSECONDS;
+ }
+ if (u.equalsIgnoreCase("NANOSECOND")) {
+ return TimeUnit.NANOSECONDS;
+ }
+ if (u.equalsIgnoreCase("NANOS")) {
+ return TimeUnit.NANOSECONDS;
+ }
+ if (u.equalsIgnoreCase("NANO")) {
+ return TimeUnit.NANOSECONDS;
+ }
+ if (u.equalsIgnoreCase("NS")) {
+ return TimeUnit.NANOSECONDS;
+ }
+
+ if (u.equalsIgnoreCase("MICROSECONDS")) {
+ return TimeUnit.MICROSECONDS;
+ }
+ if (u.equalsIgnoreCase("MICROSECOND")) {
+ return TimeUnit.MICROSECONDS;
+ }
+ if (u.equalsIgnoreCase("MICROS")) {
+ return TimeUnit.MICROSECONDS;
+ }
+ if (u.equalsIgnoreCase("MICRO")) {
+ return TimeUnit.MICROSECONDS;
+ }
+
+ if (u.equalsIgnoreCase("MILLISECONDS")) {
+ return TimeUnit.MILLISECONDS;
+ }
+ if (u.equalsIgnoreCase("MILLISECOND")) {
+ return TimeUnit.MILLISECONDS;
+ }
+ if (u.equalsIgnoreCase("MILLIS")) {
+ return TimeUnit.MILLISECONDS;
+ }
+ if (u.equalsIgnoreCase("MILLI")) {
+ return TimeUnit.MILLISECONDS;
+ }
+ if (u.equalsIgnoreCase("MS")) {
+ return TimeUnit.MILLISECONDS;
+ }
- if (u.equalsIgnoreCase("NANOSECONDS")) return TimeUnit.NANOSECONDS;
- if (u.equalsIgnoreCase("NANOSECOND")) return TimeUnit.NANOSECONDS;
- if (u.equalsIgnoreCase("NANOS")) return TimeUnit.NANOSECONDS;
- if (u.equalsIgnoreCase("NANO")) return TimeUnit.NANOSECONDS;
- if (u.equalsIgnoreCase("NS")) return TimeUnit.NANOSECONDS;
-
- if (u.equalsIgnoreCase("MICROSECONDS")) return TimeUnit.MICROSECONDS;
- if (u.equalsIgnoreCase("MICROSECOND")) return TimeUnit.MICROSECONDS;
- if (u.equalsIgnoreCase("MICROS")) return TimeUnit.MICROSECONDS;
- if (u.equalsIgnoreCase("MICRO")) return TimeUnit.MICROSECONDS;
-
- if (u.equalsIgnoreCase("MILLISECONDS")) return TimeUnit.MILLISECONDS;
- if (u.equalsIgnoreCase("MILLISECOND")) return TimeUnit.MILLISECONDS;
- if (u.equalsIgnoreCase("MILLIS")) return TimeUnit.MILLISECONDS;
- if (u.equalsIgnoreCase("MILLI")) return TimeUnit.MILLISECONDS;
- if (u.equalsIgnoreCase("MS")) return TimeUnit.MILLISECONDS;
-
- if (u.equalsIgnoreCase("SECONDS")) return TimeUnit.SECONDS;
- if (u.equalsIgnoreCase("SECOND")) return TimeUnit.SECONDS;
- if (u.equalsIgnoreCase("SEC")) return TimeUnit.SECONDS;
- if (u.equalsIgnoreCase("S")) return TimeUnit.SECONDS;
-
- if (u.equalsIgnoreCase("MINUTES")) return TimeUnit.MINUTES;
- if (u.equalsIgnoreCase("MINUTE")) return TimeUnit.MINUTES;
- if (u.equalsIgnoreCase("MIN")) return TimeUnit.MINUTES;
- if (u.equalsIgnoreCase("M")) return TimeUnit.MINUTES;
-
- if (u.equalsIgnoreCase("HOURS")) return TimeUnit.HOURS;
- if (u.equalsIgnoreCase("HOUR")) return TimeUnit.HOURS;
- if (u.equalsIgnoreCase("HRS")) return TimeUnit.HOURS;
- if (u.equalsIgnoreCase("HR")) return TimeUnit.HOURS;
- if (u.equalsIgnoreCase("H")) return TimeUnit.HOURS;
-
- if (u.equalsIgnoreCase("DAYS")) return TimeUnit.DAYS;
- if (u.equalsIgnoreCase("DAY")) return TimeUnit.DAYS;
- if (u.equalsIgnoreCase("D")) return TimeUnit.DAYS;
+ if (u.equalsIgnoreCase("SECONDS")) {
+ return TimeUnit.SECONDS;
+ }
+ if (u.equalsIgnoreCase("SECOND")) {
+ return TimeUnit.SECONDS;
+ }
+ if (u.equalsIgnoreCase("SEC")) {
+ return TimeUnit.SECONDS;
+ }
+ if (u.equalsIgnoreCase("S")) {
+ return TimeUnit.SECONDS;
+ }
+
+ if (u.equalsIgnoreCase("MINUTES")) {
+ return TimeUnit.MINUTES;
+ }
+ if (u.equalsIgnoreCase("MINUTE")) {
+ return TimeUnit.MINUTES;
+ }
+ if (u.equalsIgnoreCase("MIN")) {
+ return TimeUnit.MINUTES;
+ }
+ if (u.equalsIgnoreCase("M")) {
+ return TimeUnit.MINUTES;
+ }
+
+ if (u.equalsIgnoreCase("HOURS")) {
+ return TimeUnit.HOURS;
+ }
+ if (u.equalsIgnoreCase("HOUR")) {
+ return TimeUnit.HOURS;
+ }
+ if (u.equalsIgnoreCase("HRS")) {
+ return TimeUnit.HOURS;
+ }
+ if (u.equalsIgnoreCase("HR")) {
+ return TimeUnit.HOURS;
+ }
+ if (u.equalsIgnoreCase("H")) {
+ return TimeUnit.HOURS;
+ }
+
+ if (u.equalsIgnoreCase("DAYS")) {
+ return TimeUnit.DAYS;
+ }
+ if (u.equalsIgnoreCase("DAY")) {
+ return TimeUnit.DAYS;
+ }
+ if (u.equalsIgnoreCase("D")) {
+ return TimeUnit.DAYS;
+ }
throw new IllegalArgumentException("Unknown time unit '" + u + "'. Supported units " + Join.join(", ", lowercase(TimeUnit.values())));
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java Sat Feb 22 01:58:19 2014
@@ -36,7 +36,9 @@ public class Enumerator implements Seria
}
public Object nextElement() {
- if (!hasMoreElements()) throw new NoSuchElementException();
+ if (!hasMoreElements()) {
+ throw new NoSuchElementException();
+ }
return list.get(index++);
}
}
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=1570779&r1=1570778&r2=1570779&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 Sat Feb 22 01:58:19 2014
@@ -87,17 +87,23 @@ public class Index<K,V> extends Abstract
}
public K getKey(final int index) {
- if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException(String.valueOf(index));
+ if (index < 0 || index >= entries.length) {
+ throw new IndexOutOfBoundsException(String.valueOf(index));
+ }
return entries[index].getKey();
}
public V get(final int index) {
- if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException(String.valueOf(index));
+ if (index < 0 || index >= entries.length) {
+ throw new IndexOutOfBoundsException(String.valueOf(index));
+ }
return entries[index].getValue();
}
public V set(final int index, final V value) {
- if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException(String.valueOf(index));
+ if (index < 0 || index >= entries.length) {
+ throw new IndexOutOfBoundsException(String.valueOf(index));
+ }
final IndexEntry<K,V> entry = entries[index];
final V oldValue = entry.getValue();
entry.setValue(value);
@@ -148,7 +154,9 @@ public class Index<K,V> extends Abstract
}
public ListIterator<V> listIterator(final int index) {
- if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException(String.valueOf(index));
+ if (index < 0 || index >= entries.length) {
+ throw new IndexOutOfBoundsException(String.valueOf(index));
+ }
return new IndexListIterator<V>(index);
}
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=1570779&r1=1570778&r2=1570779&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 Sat Feb 22 01:58:19 2014
@@ -38,13 +38,16 @@ public class IntrospectionSupport {
String optionPrefix) {
boolean rc = false;
- if (target == null)
+ if (target == null) {
throw new IllegalArgumentException("target was null.");
- if (props == null)
+ }
+ if (props == null) {
throw new IllegalArgumentException("props was null.");
+ }
- if (optionPrefix == null)
+ if (optionPrefix == null) {
optionPrefix = "";
+ }
final Class clazz = target.getClass();
final Method[] methods = clazz.getMethods();
@@ -59,12 +62,14 @@ public class IntrospectionSupport {
try {
final Object value = method.invoke(target, new Object[] {});
- if (value == null)
+ if (value == null) {
continue;
+ }
final String strValue = convertToString(value, type);
- if (strValue == null)
+ if (strValue == null) {
continue;
+ }
name = name.substring(3, 4).toLowerCase()
+ name.substring(4);
@@ -84,10 +89,12 @@ public class IntrospectionSupport {
public static boolean setProperties(final Object target, final Map props,
final String optionPrefix) {
boolean rc = false;
- if (target == null)
+ if (target == null) {
throw new IllegalArgumentException("target was null.");
- if (props == null)
+ }
+ if (props == null) {
throw new IllegalArgumentException("props was null.");
+ }
for (final Iterator iter = props.keySet().iterator(); iter.hasNext();) {
String name = (String) iter.next();
@@ -104,8 +111,9 @@ public class IntrospectionSupport {
}
public static Map extractProperties(final Map props, final String optionPrefix) {
- if (props == null)
+ if (props == null) {
throw new IllegalArgumentException("props was null.");
+ }
final HashMap<String, Object> rc = new HashMap<String, Object>(props.size());
@@ -125,10 +133,12 @@ public class IntrospectionSupport {
public static boolean setProperties(final Object target, final Map props) {
boolean rc = false;
- if (target == null)
+ if (target == null) {
throw new IllegalArgumentException("target was null.");
- if (props == null)
+ }
+ if (props == null) {
throw new IllegalArgumentException("props was null.");
+ }
for (final Iterator iter = props.entrySet().iterator(); iter.hasNext();) {
final Map.Entry entry = (Entry) iter.next();
@@ -145,8 +155,9 @@ public class IntrospectionSupport {
try {
final Class clazz = target.getClass();
final Method setter = findSetterMethod(clazz, name);
- if (setter == null)
+ if (setter == null) {
return false;
+ }
// If the type is null or it matches the needed type, just use the
// value directly
@@ -206,12 +217,15 @@ public class IntrospectionSupport {
}
private static boolean isSettableType(final Class clazz) {
- if (PropertyEditorManager.findEditor(clazz) != null)
+ if (PropertyEditorManager.findEditor(clazz) != null) {
return true;
- if (clazz == URI.class)
+ }
+ if (clazz == URI.class) {
return true;
- if (clazz == Boolean.class)
+ }
+ if (clazz == Boolean.class) {
return true;
+ }
return false;
}
@@ -257,8 +271,9 @@ public class IntrospectionSupport {
private static void addFields(final Object target, final Class startClass,
final Class stopClass, final LinkedHashMap<String, Object> map) {
- if (startClass != stopClass)
+ if (startClass != stopClass) {
addFields(target, startClass.getSuperclass(), stopClass, map);
+ }
final Field[] fields = startClass.getDeclaredFields();
for (int i = 0; i < fields.length; i++) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarCreator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarCreator.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarCreator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarCreator.java Sat Feb 22 01:58:19 2014
@@ -51,8 +51,10 @@ public final class JarCreator {
private static void jarFile(final JarOutputStream out, final File f, final String prefix) throws IOException {
if (f.isDirectory()) {
final File[] files = f.listFiles();
- if (null != files) for (final File child : files) {
- jarFile(out, child, prefix);
+ if (null != files) {
+ for (final File child : files) {
+ jarFile(out, child, prefix);
+ }
}
} else {
final byte[] buffer = new byte[BUFFER_SIZE];
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=1570779&r1=1570778&r2=1570779&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 Sat Feb 22 01:58:19 2014
@@ -183,8 +183,9 @@ public class JarExtractor {
* @param dir File object representing the directory to be deleted
*/
public static boolean deleteDir(final File dir) {
- if (dir == null)
+ if (dir == null) {
return true;
+ }
if (dir.isDirectory()) {
final File[] files = dir.listFiles();
@@ -218,8 +219,9 @@ public class JarExtractor {
final byte[] buffer = new byte[2048];
while (true) {
final int n = input.read(buffer);
- if (n <= 0)
+ if (n <= 0) {
break;
+ }
output.write(buffer, 0, n);
}
} finally {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java Sat Feb 22 01:58:19 2014
@@ -98,7 +98,9 @@ public class JuliLogStream implements Lo
final Logger log = LoggerCreator.Get.exec(logger, debug, info);
if (log.isLoggable(level)) {
final LogRecord logRecord = new OpenEJBLogRecord(level, message);
- if (t != null) logRecord.setThrown(t);
+ if (t != null) {
+ logRecord.setThrown(t);
+ }
log.log(logRecord);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LengthInputStream.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LengthInputStream.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LengthInputStream.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LengthInputStream.java Sat Feb 22 01:58:19 2014
@@ -30,21 +30,27 @@ public class LengthInputStream extends F
@Override
public int read() throws IOException {
final int i = super.read();
- if (i > 0) length++;
+ if (i > 0) {
+ length++;
+ }
return i;
}
@Override
public int read(final byte[] b) throws IOException {
final int i = super.read(b);
- if (i > 0) length += i;
+ if (i > 0) {
+ length += i;
+ }
return i;
}
@Override
public int read(final byte[] b, final int off, final int len) throws IOException {
final int i = super.read(b, off, len);
- if (i > 0) length += i;
+ if (i > 0) {
+ length += i;
+ }
return i;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LinkedListStack.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LinkedListStack.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LinkedListStack.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LinkedListStack.java Sat Feb 22 01:58:19 2014
@@ -27,16 +27,17 @@ public class LinkedListStack implements
private int size;
public LinkedListStack(final int initialSize) {
- for (int i = 0; i < initialSize; i++)
+ for (int i = 0; i < initialSize; i++) {
vacantEntries = new LinkedEntry(null, vacantEntries);
+ }
}
public synchronized Object push(final Object object) {
/* Take an entry from the vacant list and move it to the occupied list. */
- if (vacantEntries == null)
+ if (vacantEntries == null) {
occupiedEntries = new LinkedEntry(object, occupiedEntries);
- else {
+ } else {
final LinkedEntry entry = vacantEntries;
@@ -52,7 +53,9 @@ public class LinkedListStack implements
/* Take an entry from the occupied list and move it to the vacant list. */
final LinkedEntry entry = occupiedEntries;
- if (entry == null) return null;
+ if (entry == null) {
+ return null;
+ }
occupiedEntries = occupiedEntries.next;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java Sat Feb 22 01:58:19 2014
@@ -48,7 +48,9 @@ public class Log4jLogStreamFactory imple
public Log4jLogStreamFactory() {
try {
final boolean externalLogging = SystemInstance.get().getOptions().get("openejb.logger.external", false);
- if (!externalLogging) configureInternal();
+ if (!externalLogging) {
+ configureInternal();
+ }
} catch (final Exception e) {
// The fall back here is that if log4j.configuration system property is set, then that configuration file will be used.
e.printStackTrace();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java Sat Feb 22 01:58:19 2014
@@ -90,14 +90,18 @@ public class Logger {
}
private static void checkForIgnoredLog4jConfig() {
- if (logStreamFactory.getClass().getName().equals("org.apache.openejb.util.Log4jLogStreamFactory")) return;
+ if (logStreamFactory.getClass().getName().equals("org.apache.openejb.util.Log4jLogStreamFactory")) {
+ return;
+ }
try {
final Properties configFile = log4j(loadLoggingProperties());
final Properties systemProperties = log4j(SystemInstance.get().getProperties());
- if (configFile.size() == 0 && systemProperties.size() == 0) return;
+ if (configFile.size() == 0 && systemProperties.size() == 0) {
+ return;
+ }
final LogStream stream = logStreamFactory.createLogStream(LogCategory.OPENEJB);
@@ -122,7 +126,9 @@ public class Logger {
final Class<?> factoryClass = load(factoryName);
- if (factoryClass == null) return null;
+ if (factoryClass == null) {
+ return null;
+ }
try {
//Try and use the user specified factory
@@ -167,8 +173,9 @@ public class Logger {
public String compute(final String key) throws InterruptedException {
final int index = key.lastIndexOf(".");
final String parent = key.substring(0, index);
- if (parent.contains(OPENEJB))
+ if (parent.contains(OPENEJB)) {
return parent;
+ }
return null;
}
};
@@ -282,8 +289,12 @@ public class Logger {
final Properties systemProperties = log4j(SystemInstance.get().getProperties());
- if (configFile.size() > 0) locations.add("conf/logging.properties");
- if (systemProperties.size() > 0) locations.add("Properties overrides");
+ if (configFile.size() > 0) {
+ locations.add("conf/logging.properties");
+ }
+ if (systemProperties.size() > 0) {
+ locations.add("Properties overrides");
+ }
}
if (locations.size() > 0) {
@@ -335,7 +346,9 @@ public class Logger {
* @return the formatted message
*/
private String formatMessage(final String message, final Object... args) {
- if (args.length == 0) return message;
+ if (args.length == 0) {
+ return message;
+ }
try {
final MessageFormat mf = messageFormatCache.compute(message);
@@ -619,18 +632,20 @@ public class Logger {
return bundle.getString(key);
} catch (final MissingResourceException e) {
final String parentName = heirarchyCache.compute(baseName);
- if (parentName == null)
+ if (parentName == null) {
return key;
- else
+ } else {
return getMessage(key, parentName);
+ }
}
} else {
final String parentName = heirarchyCache.compute(baseName);
- if (parentName == null)
+ if (parentName == null) {
return key;
- else
+ } else {
return getMessage(key, parentName);
+ }
}
} catch (final InterruptedException e) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Memoizer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Memoizer.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Memoizer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Memoizer.java Sat Feb 22 01:58:19 2014
@@ -36,7 +36,9 @@ public class Memoizer<K, V> implements C
* if c is null
*/
public Memoizer(final Computable<K, V> c) {
- if(c == null) throw new NullPointerException("Computable cache value source algorithm may not be null");
+ if(c == null) {
+ throw new NullPointerException("Computable cache value source algorithm may not be null");
+ }
this.c = c;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java Sat Feb 22 01:58:19 2014
@@ -54,7 +54,9 @@ public final class OpenEjbVersion {
}
public static OpenEjbVersion get() {
- if (openEjbVersion == null) openEjbVersion = new OpenEjbVersion();
+ if (openEjbVersion == null) {
+ openEjbVersion = new OpenEjbVersion();
+ }
return openEjbVersion;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java Sat Feb 22 01:58:19 2014
@@ -230,7 +230,9 @@ public class PojoSerialization implement
protected void read(final ObjectInput in) throws IOException, ClassNotFoundException {
byte b = in.readByte();
- if (b != CLASS) throw new IOException("Expected 'CLASS' byte " + CLASS + ", got: " + b);
+ if (b != CLASS) {
+ throw new IOException("Expected 'CLASS' byte " + CLASS + ", got: " + b);
+ }
Class clazz = (Class) in.readObject();
@@ -280,8 +282,12 @@ public class PojoSerialization implement
final Field[] fields = clazz.getDeclaredFields();
for (final Field field : fields) {
- if (Modifier.isStatic(field.getModifiers())) continue;
- if (Modifier.isTransient(field.getModifiers())) continue;
+ if (Modifier.isStatic(field.getModifiers())) {
+ continue;
+ }
+ if (Modifier.isTransient(field.getModifiers())) {
+ continue;
+ }
field.setAccessible(true);
out.writeByte(FIELD);
out.writeUTF(field.getName());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java Sat Feb 22 01:58:19 2014
@@ -98,8 +98,12 @@ public class Pool<T> {
}
public Pool(final int max, final int min, final boolean strict, final long maxAge, final long idleTimeout, long sweepInterval, final Executor executor, final Supplier<T> supplier, final boolean replaceAged, final double maxAgeOffset, final boolean garbageCollection, final boolean replaceFlushed) {
- if (min > max) greater("max", max, "min", min);
- if (maxAge != 0 && idleTimeout > maxAge) greater("MaxAge", maxAge, "IdleTimeout", idleTimeout);
+ if (min > max) {
+ greater("max", max, "min", min);
+ }
+ if (maxAge != 0 && idleTimeout > maxAge) {
+ greater("MaxAge", maxAge, "IdleTimeout", idleTimeout);
+ }
this.executor = executor != null ? executor : createExecutor();
this.supplier = supplier != null ? supplier : new NoSupplier();
this.available = strict ? new Semaphore(max) : new Overdraft(max);
@@ -109,7 +113,9 @@ public class Pool<T> {
this.maxAgeOffset = maxAgeOffset;
this.replaceAged = replaceAged;
this.replaceFlushed = replaceFlushed;
- if (sweepInterval == 0) sweepInterval = 5 * 60 * 1000; // five minutes
+ if (sweepInterval == 0) {
+ sweepInterval = 5 * 60 * 1000; // five minutes
+ }
this.sweepInterval = sweepInterval;
this.sweeper = new Sweeper(idleTimeout, max);
this.stats = new Stats(min, max, idleTimeout);
@@ -190,7 +196,9 @@ public class Pool<T> {
if (timeout == -1) {
available.tryAcquire();
} else if (!available.tryAcquire(timeout, unit)) {
- if (record) stats.accessTimeouts.record();
+ if (record) {
+ stats.accessTimeouts.record();
+ }
throw new TimeoutException("Waited " + timeout + " " + unit);
}
@@ -211,7 +219,9 @@ public class Pool<T> {
final boolean notBusy = entry.active.compareAndSet(null, instance);
- if (notBusy) return entry;
+ if (notBusy) {
+ return entry;
+ }
} else {
// the SoftReference was garbage collected
instances.release();
@@ -245,7 +255,9 @@ public class Pool<T> {
if (available.tryAcquire(100, MILLISECONDS)) {
try {
- if (push(obj, offset)) return true;
+ if (push(obj, offset)) {
+ return true;
+ }
available.release();
} catch (final RuntimeException e) {
available.release();
@@ -289,9 +301,13 @@ public class Pool<T> {
return push(new Entry(obj, offset));
}
- if (obj != null) new Discard(obj, Event.FULL).run();
+ if (obj != null) {
+ new Discard(obj, Event.FULL).run();
+ }
- if (available instanceof Overdraft) available.release();
+ if (available instanceof Overdraft) {
+ available.release();
+ }
return false;
}
@@ -308,9 +324,13 @@ public class Pool<T> {
final Entry.Instance obj = entry == null ? null : entry.active.getAndSet(null);
try {
- if (entry == null) return added;
+ if (entry == null) {
+ return added;
+ }
- if (!sweeper) entry.markLastUsed();
+ if (!sweeper) {
+ entry.markLastUsed();
+ }
final long age = now() - entry.created;
@@ -318,8 +338,12 @@ public class Pool<T> {
final boolean flushed = entry.version != this.poolVersion.get();
if (aged || flushed) {
- if (aged) event = Event.AGED;
- if (flushed) event = Event.FLUSHED;
+ if (aged) {
+ event = Event.AGED;
+ }
+ if (flushed) {
+ event = Event.FLUSHED;
+ }
if (entry.hasHardReference() || aged && replaceAged || flushed && replaceFlushed) {
// Don't release the lock, this
// entry will be directly replaced
@@ -329,7 +353,9 @@ public class Pool<T> {
}
} else {
// make this a "min" instance if we can
- if (!entry.hasHardReference() && minimum.tryAcquire()) entry.hard.set(obj);
+ if (!entry.hasHardReference() && minimum.tryAcquire()) {
+ entry.hard.set(obj);
+ }
synchronized (pool) {
pool.addFirst(entry);
@@ -396,8 +422,12 @@ public class Pool<T> {
public boolean close(final long timeout, final TimeUnit unit) throws InterruptedException {
// drain all keys so no new instances will be accepted into the pool
- while (instances.tryAcquire()) ; //NOPMD
- while (minimum.tryAcquire()) ; //NOPMD
+ while (instances.tryAcquire()) {
+ ; //NOPMD
+ }
+ while (minimum.tryAcquire()) {
+ ; //NOPMD
+ }
// Stop the sweeper thread
stop();
@@ -407,7 +437,11 @@ public class Pool<T> {
sweeper.run();
// Drain all leases
- if (!(available instanceof Overdraft)) while (available.tryAcquire()) ; //NOPMD
+ if (!(available instanceof Overdraft)) {
+ while (available.tryAcquire()) {
+ ; //NOPMD
+ }
+ }
// Wait for any pending discards
return out.await(timeout, unit);
@@ -464,7 +498,9 @@ public class Pool<T> {
* @param offset creation time offset, used for maxAge
*/
private Entry(final T obj, final long offset) {
- if (obj == null) throw new NullPointerException("entry is null");
+ if (obj == null) {
+ throw new NullPointerException("entry is null");
+ }
final Instance instance = new Instance(obj);
this.soft = garbageCollection ?
new SoftReference<Instance>(instance) :
@@ -577,7 +613,9 @@ public class Pool<T> {
// No timeouts to enforce?
// Pool version not changed?
// Just return
- if (!timeouts && isCurrent) return;
+ if (!timeouts && isCurrent) {
+ return;
+ }
final long now = now();
@@ -726,7 +764,9 @@ public class Pool<T> {
}
public boolean tryDiscard() {
- if (discarded.getAndSet(true)) return false;
+ if (discarded.getAndSet(true)) {
+ return false;
+ }
discard(entry);
@@ -734,9 +774,15 @@ public class Pool<T> {
}
public boolean replaceMinEntry(final Entry replacement) {
- if (!entry.hasHardReference()) return false;
- if (replacement.hasHardReference()) return false;
- if (discarded.getAndSet(true)) return false;
+ if (!entry.hasHardReference()) {
+ return false;
+ }
+ if (replacement.hasHardReference()) {
+ return false;
+ }
+ if (discarded.getAndSet(true)) {
+ return false;
+ }
discardAndReplace(entry, replacement);
@@ -771,7 +817,9 @@ public class Pool<T> {
discard(expired);
} else {
final Entry entry = new Entry(t, offset);
- if (expired.hasHardReference()) entry.harden();
+ if (expired.hasHardReference()) {
+ entry.harden();
+ }
push(entry);
}
} catch (final Throwable e) {
@@ -790,7 +838,9 @@ public class Pool<T> {
private Discard(final T expired, final Event event) {
out.countUp();
- if (expired == null) throw new NullPointerException("expired object cannot be null");
+ if (expired == null) {
+ throw new NullPointerException("expired object cannot be null");
+ }
this.expired = expired;
this.event = event;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/References.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/References.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/References.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/References.java Sat Feb 22 01:58:19 2014
@@ -57,7 +57,9 @@ public class References {
for (final Node node : nodes.values()) {
for (final String name : visitor.getReferences((T) node.object)) {
final Node ref = nodes.get(name);
- if (ref == null) throw new IllegalArgumentException("No such object in list: "+name);
+ if (ref == null) {
+ throw new IllegalArgumentException("No such object in list: " + name);
+ }
node.references.add(ref);
node.initialReferences.add(ref);
}
@@ -199,8 +201,12 @@ public class References {
}
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final Node node = (Node) o;
@@ -237,12 +243,18 @@ public class References {
}
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final Circuit circuit = (Circuit) o;
- if (!atomic.equals(circuit.atomic)) return false;
+ if (!atomic.equals(circuit.atomic)) {
+ return false;
+ }
return true;
}
@@ -253,7 +265,9 @@ public class References {
public int compareTo(final Circuit o) {
int i = atomic.size() - o.atomic.size();
- if (i != 0) return i;
+ if (i != 0) {
+ return i;
+ }
final Iterator<Node> iterA = atomic.listIterator();
final Iterator<Node> iterB = o.atomic.listIterator();
@@ -261,7 +275,9 @@ public class References {
final Node a = iterA.next();
final Node b = iterB.next();
i = a.compareTo(b);
- if (i != 0) return i;
+ if (i != 0) {
+ return i;
+ }
}
return 0;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ServiceManagerProxy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ServiceManagerProxy.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ServiceManagerProxy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ServiceManagerProxy.java Sat Feb 22 01:58:19 2014
@@ -55,7 +55,9 @@ public class ServiceManagerProxy {
final Method get = getMethod("get");
final Method getManager = getMethod("getManager");
- if (checkAlreadyStarted && invoke(get, null) != null) throw new AlreadyStartedException("Server services already started");
+ if (checkAlreadyStarted && invoke(get, null) != null) {
+ throw new AlreadyStartedException("Server services already started");
+ }
serviceManager = invoke(getManager, null);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java Sat Feb 22 01:58:19 2014
@@ -36,7 +36,9 @@ public class StringTemplate {
while (matcher.find()) {
final String key = matcher.group(2);
- if (key == null) throw new IllegalStateException("Key is null. Template '" + template + "'");
+ if (key == null) {
+ throw new IllegalStateException("Key is null. Template '" + template + "'");
+ }
String value = map.get(key);
@@ -48,7 +50,9 @@ public class StringTemplate {
value = Strings.camelCase(map.get(key.substring(0, key.length() - 3)));
}
- if (value == null) throw new IllegalStateException("Value is null for key '" + key + "'. Template '" + template + "'. Keys: " + Join.join(", ", map.keySet()));
+ if (value == null) {
+ throw new IllegalStateException("Value is null for key '" + key + "'. Template '" + template + "'. Keys: " + Join.join(", ", map.keySet()));
+ }
matcher.appendReplacement(buf, value);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java Sat Feb 22 01:58:19 2014
@@ -27,7 +27,9 @@ public class Strings {
}
public static String lowercase(final String string) {
- if (string == null) return null;
+ if (string == null) {
+ return null;
+ }
final StringBuilder sb = new StringBuilder(string);
for (int i = 0; i < sb.length(); i++) {
@@ -41,7 +43,9 @@ public class Strings {
}
public static String uppercase(final String string) {
- if (string == null) return null;
+ if (string == null) {
+ return null;
+ }
final StringBuilder sb = new StringBuilder(string);
for (int i = 0; i < sb.length(); i++) {
@@ -51,7 +55,9 @@ public class Strings {
}
public static String ucfirst(final String string){
- if (string == null) return null;
+ if (string == null) {
+ return null;
+ }
final StringBuilder sb = new StringBuilder(string);
if (sb.length() > 0){
@@ -61,7 +67,9 @@ public class Strings {
}
public static String lcfirst(final String string){
- if (string == null) return null;
+ if (string == null) {
+ return null;
+ }
final StringBuilder sb = new StringBuilder(string);
if (sb.length() > 0){
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java Sat Feb 22 01:58:19 2014
@@ -181,8 +181,12 @@ public class SuperProperties extends Pro
* @param keyValueSeparator the text that separates keys and values
*/
public void setKeyValueSeparator(final String keyValueSeparator) {
- if (keyValueSeparator == null) throw new NullPointerException("keyValueSeparator is null");
- if (keyValueSeparator.length() == 0) throw new NullPointerException("keyValueSeparator is empty");
+ if (keyValueSeparator == null) {
+ throw new NullPointerException("keyValueSeparator is null");
+ }
+ if (keyValueSeparator.length() == 0) {
+ throw new NullPointerException("keyValueSeparator is empty");
+ }
this.keyValueSeparator = keyValueSeparator;
}
@@ -200,8 +204,12 @@ public class SuperProperties extends Pro
* @param lineSeparator the text that separates lines
*/
public void setLineSeparator(final String lineSeparator) {
- if (lineSeparator == null) throw new NullPointerException("lineSeparator is null");
- if (lineSeparator.length() == 0) throw new NullPointerException("lineSeparator is empty");
+ if (lineSeparator == null) {
+ throw new NullPointerException("lineSeparator is null");
+ }
+ if (lineSeparator.length() == 0) {
+ throw new NullPointerException("lineSeparator is empty");
+ }
this.lineSeparator = lineSeparator;
}
@@ -320,8 +328,12 @@ public class SuperProperties extends Pro
* @param comment the comment; not null
*/
public void setComment(String name, final String comment) {
- if (name == null) throw new NullPointerException("name is null");
- if (comment == null) throw new NullPointerException("comment is null");
+ if (name == null) {
+ throw new NullPointerException("name is null");
+ }
+ if (comment == null) {
+ throw new NullPointerException("comment is null");
+ }
name = normalize(name);
comments.put(name, comment);
@@ -335,7 +347,9 @@ public class SuperProperties extends Pro
* @return the attributes for an existing property (not null); null for non-existant properties
*/
public Map<String,String> getAttributes(String name) {
- if (name == null) throw new NullPointerException("name is null");
+ if (name == null) {
+ throw new NullPointerException("name is null");
+ }
name = normalize(name);
Map<String, String> attributes = this.attributes.get(name);
@@ -416,7 +430,9 @@ public class SuperProperties extends Pro
while (true) {
int nextByte = decodeNextCharacter(in);
- if (nextByte == EOF) break;
+ if (nextByte == EOF) {
+ break;
+ }
char nextChar = (char) (nextByte & 0xff);
switch (nextByte) {
@@ -490,7 +506,9 @@ public class SuperProperties extends Pro
boolean inIndent = true;
while (true) {
nextByte = in.read();
- if (nextByte < 0) break;
+ if (nextByte < 0) {
+ break;
+ }
nextChar = (char) nextByte; // & 0xff
if (inIndent && nextChar == ' ') {
@@ -617,7 +635,9 @@ public class SuperProperties extends Pro
while (true) {
// read character
int nextByte = in.read();
- if (nextByte < 0) return EOF;
+ if (nextByte < 0) {
+ return EOF;
+ }
char nextChar = (char) (nextByte & 0xff);
// if line continuation character was '\r', we need to ignore an optional '\n'
@@ -948,7 +968,9 @@ public class SuperProperties extends Pro
boolean inIndent = true;
while (true) {
nextByte = cin.read();
- if (nextByte < 0) break;
+ if (nextByte < 0) {
+ break;
+ }
nextChar = (char) nextByte; // & 0xff
if (inIndent && nextChar == ' ') {
commentLineIndent++;
@@ -1289,7 +1311,9 @@ public class SuperProperties extends Pro
for (final Object o : keySet()) {
if (o instanceof String) {
final String key = (String) o;
- if (key.equalsIgnoreCase(property)) return key;
+ if (key.equalsIgnoreCase(property)) {
+ return key;
+ }
}
}
@@ -1297,7 +1321,9 @@ public class SuperProperties extends Pro
for (final Object o : defaults.keySet()) {
if (o instanceof String) {
final String key = (String) o;
- if (key.equalsIgnoreCase(property)) return key;
+ if (key.equalsIgnoreCase(property)) {
+ return key;
+ }
}
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Tee.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Tee.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Tee.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Tee.java Sat Feb 22 01:58:19 2014
@@ -68,7 +68,9 @@ public final class Tee implements Runnab
System.out.print("#");
for (int o = 0; o < out.length; o++) {
try {
- if (out[o] == null) continue;
+ if (out[o] == null) {
+ continue;
+ }
out[o].write(buf, 0, i);
} catch (final Exception e) {
new Exception(out[o].toString(), e).printStackTrace();
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=1570779&r1=1570778&r2=1570779&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 Sat Feb 22 01:58:19 2014
@@ -53,11 +53,17 @@ public class URISupport {
* @return relative b
*/
public static URI relativize(final URI a, URI b) {
- if (a == null || b == null) return b;
+ if (a == null || b == null) {
+ return b;
+ }
- if (!a.isAbsolute() && b.isAbsolute()) return b;
+ if (!a.isAbsolute() && b.isAbsolute()) {
+ return b;
+ }
- if (!b.isAbsolute()) b = a.resolve(b);
+ if (!b.isAbsolute()) {
+ b = a.resolve(b);
+ }
final List<String> pathA = Arrays.asList(a.getPath().split("/"));
final List<String> pathB = Arrays.asList(b.getPath().split("/"));
@@ -69,8 +75,11 @@ public class URISupport {
while (lastMatch < limit) {
final String aa = pathA.get(lastMatch);
final String bb = pathB.get(lastMatch);
- if (aa.equals(bb)) lastMatch++;
- else break;
+ if (aa.equals(bb)) {
+ lastMatch++;
+ } else {
+ break;
+ }
}
final List<String> path = new ArrayList<String>();
@@ -127,8 +136,9 @@ public class URISupport {
} else {
sb.append('(');
for (int i = 0; i < components.length; i++) {
- if( i!=0 )
+ if( i!=0 ) {
sb.append(',');
+ }
sb.append(components[i].toString());
}
sb.append(')');
@@ -241,8 +251,9 @@ public class URISupport {
}
rc.parameters = parseQuery(params.substring(p+1));
} else {
- if( params.length() > 0 )
+ if( params.length() > 0 ) {
rc.path = stripPrefix(params, "/");
+ }
rc.parameters = new LinkedHashMap();
}
}
@@ -271,8 +282,9 @@ public class URISupport {
}
final String s = str.substring(last);
- if( s.length() !=0 )
+ if( s.length() !=0 ) {
l.add(s);
+ }
final String[] rc = new String[l.size()];
l.toArray(rc);
@@ -280,8 +292,9 @@ public class URISupport {
}
public static String stripPrefix(final String value, final String prefix) {
- if( value.startsWith(prefix) )
+ if( value.startsWith(prefix) ) {
return value.substring(prefix.length());
+ }
return value;
}
@@ -295,10 +308,11 @@ public class URISupport {
final StringBuilder rc = new StringBuilder();
boolean first=true;
for (final Iterator iter = options.keySet().iterator(); iter.hasNext();) {
- if( first )
- first=false;
- else
+ if( first ) {
+ first = false;
+ } else {
rc.append("&");
+ }
final String key = (String) iter.next();
final String value = (String)options.get(key);
@@ -321,8 +335,9 @@ public class URISupport {
*/
public static URI createRemainingURI(final URI originalURI, final Map params) throws URISyntaxException {
String s = createQueryString(params);
- if( s.length()==0 )
+ if( s.length()==0 ) {
s = null;
+ }
return createURIWithQuery(originalURI, s);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java Sat Feb 22 01:58:19 2014
@@ -44,7 +44,9 @@ public final class URLs {
/*
* REMIND: we don't handle nested JAR URLs
*/
- if (separator == -1) throw new MalformedURLException("no ! found in jar url spec:" + spec);
+ if (separator == -1) {
+ throw new MalformedURLException("no ! found in jar url spec:" + spec);
+ }
return new URL(spec.substring(0, separator++));
} catch (final MalformedURLException e) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlComparator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlComparator.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlComparator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlComparator.java Sat Feb 22 01:58:19 2014
@@ -71,7 +71,9 @@ public class UrlComparator implements Co
}
private void path(final File file, final List<String> path){
- if (file == null) return;
+ if (file == null) {
+ return;
+ }
path(file.getParentFile(), path);