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/05/27 20:14:18 UTC

svn commit: r1597843 [2/2] - in /tomee/tomee/trunk: arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/ arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ arquillian/arquilli...

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java Tue May 27 18:14:16 2014
@@ -104,7 +104,7 @@ public class ResizableDoubleArray implem
      * Determines whether array expansion by <code>expansionFactor</code>
      * is additive or multiplicative.
      */
-    protected int expansionMode = MULTIPLICATIVE_MODE;
+    protected int expansionMode;
 
     /**
      * The initial capacity of the array.  Initial capacity is not exposed as a
@@ -121,7 +121,7 @@ public class ResizableDoubleArray implem
      * The number of addressable elements in the array.  Note that this
      * has nothing to do with the length of the internal storage array.
      */
-    protected int numElements = 0;
+    protected int numElements;
 
     /**
      * The position of the first addressable element in the internal storage
@@ -129,7 +129,7 @@ public class ResizableDoubleArray implem
      * internalArray[startIndex],...,internalArray[startIndex + numElements -1]
      * </code>
      */
-    protected int startIndex = 0;
+    protected int startIndex;
 
     /**
      * Create a ResizableArray with default properties.

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/remote/RemoteResourceMonitor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/remote/RemoteResourceMonitor.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/remote/RemoteResourceMonitor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/remote/RemoteResourceMonitor.java Tue May 27 18:14:16 2014
@@ -55,8 +55,8 @@ public class RemoteResourceMonitor imple
                                                             }, String.class.getName(), MBeanOperationInfo.INFO);
 
     private final Collection<String> hosts = new CopyOnWriteArraySet<String>();
-    private ObjectName objectName = null;
-    private MBeanInfo info = null;
+    private ObjectName objectName;
+    private MBeanInfo info;
 
     public synchronized void addHost(final String host) {
         hosts.add(host);

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java Tue May 27 18:14:16 2014
@@ -43,8 +43,8 @@ public class JtaQuery implements Query {
     private final JtaEntityManager jtaEntityManager;
     private final Collection<QueryOperation> appliedOperations = new ArrayList<QueryOperation>();
 
-    private boolean underTx = false;
-    private Query query = null;
+    private boolean underTx;
+    private Query query;
 
     public JtaQuery(final EntityManager entityManager, final JtaEntityManager jtaEntityManager, final Method method, final Object... args) {
         this.entityManager = entityManager;

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=1597843&r1=1597842&r2=1597843&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 Tue May 27 18:14:16 2014
@@ -76,7 +76,7 @@ public class GeronimoConnectionManagerFa
     private boolean pooling = true;
     private String partitionStrategy; //: none, by-subject, by-connector-properties
     private int poolMaxSize = 10;
-    private int poolMinSize = 0;
+    private int poolMinSize;
     private boolean allConnectionsEqual = true;
     private int connectionMaxWaitMilliseconds = 5000;
     private int connectionMaxIdleMinutes = 15;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java Tue May 27 18:14:16 2014
@@ -51,7 +51,7 @@ public class ActiveMQ5Factory implements
 
     private static Properties properties;
     private static final Map<URI, BrokerService> brokers = new HashMap<URI, BrokerService>();
-    private static Throwable throwable = null;
+    private static Throwable throwable;
     private static final AtomicBoolean started = new AtomicBoolean(false);
 
     public static void setThreadProperties(final Properties p) {

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java Tue May 27 18:14:16 2014
@@ -39,7 +39,7 @@ public class ActiveMQResourceAdapter ext
     private String dataSource;
     private String useDatabaseLock;
     private String startupTimeout = "60000";
-    private BootstrapContext bootstrapContext = null;
+    private BootstrapContext bootstrapContext;
 
     public String getDataSource() {
         return dataSource;

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=1597843&r1=1597842&r2=1597843&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 Tue May 27 18:14:16 2014
@@ -44,7 +44,7 @@ public class BasicDataSource extends org
 
     private static final ReentrantLock lock = new ReentrantLock();
 
-    private Logger logger = null;
+    private Logger logger;
 
     /**
      * The password codec to be used to retrieve the plain text password from a
@@ -53,9 +53,9 @@ public class BasicDataSource extends org
      * <em>The default is no codec.</em>. In other words, it means password is
      * not ciphered. The {@link org.apache.openejb.cipher.PlainTextPasswordCipher} can also be used.
      */
-    private String passwordCipher = null;
-    private JMXBasicDataSource jmxDs = null;
-    private CommonDataSource delegate = null;
+    private String passwordCipher;
+    private JMXBasicDataSource jmxDs;
+    private CommonDataSource delegate;
 
     public BasicDataSource() {
         // no-op

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=1597843&r1=1597842&r2=1597843&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 Tue May 27 18:14:16 2014
@@ -40,7 +40,7 @@ public class BasicManagedDataSource exte
 
     private static final ReentrantLock lock = new ReentrantLock();
 
-    private Logger logger = null;
+    private Logger logger;
 
     /**
      * The password codec to be used to retrieve the plain text password from a
@@ -49,8 +49,8 @@ public class BasicManagedDataSource exte
      * <em>The default is no codec.</em>. In other words, it means password is
      * not ciphered. The {@link org.apache.openejb.cipher.PlainTextPasswordCipher} can also be used.
      */
-    private String passwordCipher = null;
-    private JMXBasicDataSource jmxDs = null;
+    private String passwordCipher;
+    private JMXBasicDataSource jmxDs;
 
     public BasicManagedDataSource(final String name) {
         registerAsMbean(name);

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/JTADataSourceWrapperFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/JTADataSourceWrapperFactory.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/JTADataSourceWrapperFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/JTADataSourceWrapperFactory.java Tue May 27 18:14:16 2014
@@ -33,7 +33,7 @@ import javax.transaction.TransactionMana
 
 public class JTADataSourceWrapperFactory {
     private String delegate = "datasource";
-    private boolean logSql = false;
+    private boolean logSql;
 
     public CommonDataSource create() {
         final TransactionManager transactionManager = OpenEJB.getTransactionManager();

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java Tue May 27 18:14:16 2014
@@ -295,7 +295,7 @@ public class QuartzResourceAdapter imple
 
     public static class JobEndpoint implements Job {
 
-        private static Method method = null;
+        private static Method method;
 
         @Override
         public void execute(final JobExecutionContext execution) throws JobExecutionException {

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=1597843&r1=1597842&r2=1597843&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 Tue May 27 18:14:16 2014
@@ -188,7 +188,7 @@ public class PseudoTransactionService im
         private final List<Synchronization> registeredSynchronizations = Collections.synchronizedList(new ArrayList<Synchronization>());
         private final List<XAResource> xaResources =  Collections.synchronizedList(new ArrayList<XAResource>());
         private final Map<Object, Object> resources = new HashMap<Object,Object>();
-        private int status = Status.STATUS_ACTIVE;
+        private int status;
 
         public boolean delistResource(final XAResource xaRes, final int flag) {
             xaResources.remove(xaRes);

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java Tue May 27 18:14:16 2014
@@ -123,15 +123,15 @@ public final class ApplicationComposers 
 
     private final Map<Object, ClassFinder> testClassFinders;
     private final Class<?> testClass;
-    private ServiceManagerProxy serviceManager = null;
+    private ServiceManagerProxy serviceManager;
 
     // invocation context
-    private AppInfo appInfo = null;
-    private Assembler assembler = null;
-    private AppContext appContext = null;
-    private ThreadContext previous = null;
-    private MockHttpSession session = null;
-    private MockServletContext servletContext = null;
+    private AppInfo appInfo;
+    private Assembler assembler;
+    private AppContext appContext;
+    private ThreadContext previous;
+    private MockHttpSession session;
+    private MockServletContext servletContext;
     private Collection<String> globalJndiEntries = new ArrayList<String>();
 
     public ApplicationComposers(final Class<?> klass, final Object... additionalModules) {

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=1597843&r1=1597842&r2=1597843&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 May 27 18:14:16 2014
@@ -212,7 +212,7 @@ public class Index<K,V> extends Abstract
     private class IndexEntrySet extends AbstractSet {
         public Iterator iterator() {
             return new Iterator() {
-                private int index = 0;
+                private int index;
                 public boolean hasNext() {
                     return index < entries.length;
                 }

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Tue May 27 18:14:16 2014
@@ -39,7 +39,7 @@ public class JuliLogStreamFactory implem
     public static final String OPENEJB_LOG_COLOR_PROP = "openejb.log.color";
 
     private static String consoleHandlerClazz;
-    private static boolean useOpenEJBHandler = false;
+    private static boolean useOpenEJBHandler;
 
     public LogStream createLogStream(final LogCategory logCategory) {
         return new JuliLogStream(logCategory);

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=1597843&r1=1597842&r2=1597843&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 Tue May 27 18:14:16 2014
@@ -284,7 +284,7 @@ public class Logger {
         return name.substring(0, name.lastIndexOf("."));
     }
 
-    private static Boolean isLog4j = null;
+    private static Boolean isLog4j;
 
     public static boolean isLog4jImplied() {
 

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=1597843&r1=1597842&r2=1597843&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 Tue May 27 18:14:16 2014
@@ -1050,7 +1050,7 @@ public class Pool<T> {
     public static class Builder<T> {
 
         private int max = 10;
-        private int min = 0;
+        private int min;
         private boolean strict = true;
         private Duration maxAge = new Duration(0, MILLISECONDS);
         private double maxAgeOffset = -1;

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=1597843&r1=1597842&r2=1597843&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 Tue May 27 18:14:16 2014
@@ -123,12 +123,12 @@ public class SuperProperties extends Pro
     /**
      * Should there be a blank line between a comment and the property.
      */
-    protected boolean spaceAfterComment = false;
+    protected boolean spaceAfterComment;
 
     /**
      * Used for loadFromXML.
      */
-    private DocumentBuilder builder = null;
+    private DocumentBuilder builder;
 
     /**
      * Constructs a new Properties object.

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java Tue May 27 18:14:16 2014
@@ -45,7 +45,7 @@ public class UpdateChecker {
     private String latest = "undefined";
 
     // internal
-    private String current = null;
+    private String current;
 
     public void check(@Observes final ObserverAdded event) {
         if (event.getObserver() != this) {

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java Tue May 27 18:14:16 2014
@@ -76,10 +76,10 @@ import java.util.TreeMap;
 public class LightweightWebAppBuilder implements WebAppBuilder {
     private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB, LightweightWebAppBuilder.class);
 
-    private static Method addServletMethod = null;
-    private static Method removeServletMethod = null;
-    private static Method addFilterMethod = null;
-    private static Method removeFilterMethod = null;
+    private static Method addServletMethod;
+    private static Method removeServletMethod;
+    private static Method addFilterMethod;
+    private static Method removeFilterMethod;
 
     static {
         try {

Modified: tomee/tomee/trunk/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java (original)
+++ tomee/tomee/trunk/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java Tue May 27 18:14:16 2014
@@ -41,7 +41,7 @@ public class Agent {
     private static final Permission ACCESS_PERMISSION = new ReflectPermission("suppressAccessChecks");
     private static String agentArgs;
     private static Instrumentation instrumentation;
-    private static boolean initialized = false;
+    private static boolean initialized;
 
     public static void premain(final String agentArgs, final Instrumentation instrumentation) {
         if (Agent.instrumentation != null) {

Modified: tomee/tomee/trunk/container/openejb-junit/src/main/java/org/apache/openejb/junit/jee/statement/StartingStatement.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-junit/src/main/java/org/apache/openejb/junit/jee/statement/StartingStatement.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-junit/src/main/java/org/apache/openejb/junit/jee/statement/StartingStatement.java (original)
+++ tomee/tomee/trunk/container/openejb-junit/src/main/java/org/apache/openejb/junit/jee/statement/StartingStatement.java Tue May 27 18:14:16 2014
@@ -34,7 +34,7 @@ import java.io.InputStream;
 public class StartingStatement extends DecoratingStatement {
     private final Class<?> clazz;
     private java.util.Properties properties;
-    private EJBContainer container = null;
+    private EJBContainer container;
 
     public StartingStatement(final Statement statement, final Class<?> clazz) {
         super(statement);

Modified: tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java Tue May 27 18:14:16 2014
@@ -381,10 +381,10 @@ public final class ProvisioningUtil {
     }
 
     private static class QuickMvnMetadataParser extends DefaultHandler {
-        private boolean readTs = false;
-        private boolean readBn = false;
-        private StringBuilder timestamp = null;
-        private StringBuilder buildNumber = null;
+        private boolean readTs;
+        private boolean readBn;
+        private StringBuilder timestamp;
+        private StringBuilder buildNumber;
 
         @Override
         public void startElement(final String uri, final String localName,

Modified: tomee/tomee/trunk/src/main/style/pmd/openejb-optimizations.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/src/main/style/pmd/openejb-optimizations.xml?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/src/main/style/pmd/openejb-optimizations.xml (original)
+++ tomee/tomee/trunk/src/main/style/pmd/openejb-optimizations.xml Tue May 27 18:14:16 2014
@@ -29,7 +29,6 @@ limitations under the License.
   <rule ref="rulesets/java/optimizations.xml">
     <exclude name="PrematureDeclaration"/> <!-- this rule is buggy -->
     <exclude name="AvoidInstantiatingObjectsInLoops"/>
-    <exclude name="RedundantFieldInitializer"/>
     <exclude name="SimplifyStartsWith"/>
     <exclude name="UseStringBufferForStringAppends"/>
     <exclude name="UseArrayListInsteadOfVector"/>

Modified: tomee/tomee/trunk/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java Tue May 27 18:14:16 2014
@@ -40,9 +40,9 @@ import java.util.Map;
 import java.util.Properties;
 
 public class RemoteTomEEEJBContainer extends EJBContainer {
-    private static RemoteTomEEEJBContainer instance = null;
-    private RemoteServer container = null;
-    private InitialContext context = null;
+    private static RemoteTomEEEJBContainer instance;
+    private RemoteServer container;
+    private InitialContext context;
 
     @Override
     public void close() {

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java Tue May 27 18:14:16 2014
@@ -45,9 +45,9 @@ public class LazyStopWebappClassLoader e
 
     public static final String TOMEE_WEBAPP_FIRST = "tomee.webapp-first";
 
-    private boolean restarting = false;
+    private boolean restarting;
     private boolean forceStopPhase = Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.webappclassloader.force-stop-phase", "false"));
-    private ClassLoaderConfigurer configurer = null;
+    private ClassLoaderConfigurer configurer;
     private final int hashCode;
 
     public LazyStopWebappClassLoader() {

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Tue May 27 18:14:16 2014
@@ -93,12 +93,12 @@ public class OpenEJBContextConfig extend
     private static final File BASE = SystemInstance.get().getBase().getDirectory();
 
     private TomcatWebAppBuilder.StandardContextInfo info;
-    private IAnnotationFinder finder = null;
-    private ClassLoader tempLoader = null;
+    private IAnnotationFinder finder;
+    private ClassLoader tempLoader;
 
     // processAnnotationXXX is called for each folder of WEB-INF
     // since we store all classes in WEB-INF we will do it only once so use this boolean to avoid multiple processing
-    private boolean webInfClassesAnnotationsProcessed = false;
+    private boolean webInfClassesAnnotationsProcessed;
 
     public OpenEJBContextConfig(final TomcatWebAppBuilder.StandardContextInfo standardContextInfo) {
         logger.debug("OpenEJBContextConfig({0})", standardContextInfo.toString());

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java Tue May 27 18:14:16 2014
@@ -53,7 +53,7 @@ public class OpenEJBNamingContextListene
     /**
      * Has the listener been started?
      */
-    private boolean running = false;
+    private boolean running;
 
     /**
      * Associated naming resources.

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java Tue May 27 18:14:16 2014
@@ -34,7 +34,7 @@ import java.util.Collection;
 public class OpenEJBNamingResource extends NamingResources {
     private static final String JAVA_PREFIX = "java:";
 
-    private boolean isTomcatResource = false;
+    private boolean isTomcatResource;
     private final Collection<ResourceBase> tomcatResources = new ArrayList<ResourceBase>();
 
     public OpenEJBNamingResource() {

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java Tue May 27 18:14:16 2014
@@ -25,7 +25,7 @@ import java.io.IOException;
 
 public class OpenEJBSecurityListener implements AsyncListener {
     private TomcatSecurityService securityService;
-    private Object oldState = null;
+    private Object oldState;
     private Request request;
 
     public OpenEJBSecurityListener(final TomcatSecurityService service, final Request req) {

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatDeploymentLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatDeploymentLoader.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatDeploymentLoader.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatDeploymentLoader.java Tue May 27 18:14:16 2014
@@ -23,8 +23,8 @@ import org.apache.openejb.config.Deploym
  * @version $Id$
  */
 public class TomcatDeploymentLoader extends DeploymentLoader {
-    private StandardContext standardContext = null;
-    private String moduleId = null;
+    private StandardContext standardContext;
+    private String moduleId;
 
     public TomcatDeploymentLoader(final StandardContext standardContext, final String moduleId) {
         this.standardContext = standardContext;

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Tue May 27 18:14:16 2014
@@ -197,7 +197,7 @@ public class TomcatWebAppBuilder impleme
     private static final boolean FORCE_RELOADABLE = SystemInstance.get().getOptions().get("tomee.force-reloadable", false);
     private static final boolean SKIP_TLD = SystemInstance.get().getOptions().get("tomee.skip-tld", false);
 
-    private static Method getNamingContextName = null; // it just sucks but that's private
+    private static Method getNamingContextName; // it just sucks but that's private
 
     static {
         try {
@@ -252,7 +252,7 @@ public class TomcatWebAppBuilder impleme
 
     private Map<ClassLoader, Map<String, Set<String>>> jsfClasses = new HashMap<ClassLoader, Map<String, Set<String>>>();
 
-    private Class<?> sessionManagerClass = null;
+    private Class<?> sessionManagerClass;
 
     private Set<CatalinaCluster> clusters = new HashSet<CatalinaCluster>();
 
@@ -671,7 +671,7 @@ public class TomcatWebAppBuilder impleme
     }
 
     // TODO: find something more sexy
-    private static Field HOST_CONFIG_HOST = null;
+    private static Field HOST_CONFIG_HOST;
 
     static {
         try { // do it only once

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/DeployMessage.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/DeployMessage.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/DeployMessage.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/DeployMessage.java Tue May 27 18:14:16 2014
@@ -28,7 +28,7 @@ public class DeployMessage extends Clust
     public static final String TOMEE_CLUSTER_DEPLOY_SEND_ARCHIVE = "tomee.cluster.deploy.send-archive";
 
     private String file;
-    private byte[] archive = null;
+    private byte[] archive;
 
     public DeployMessage(final String path) {
         file = path;

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java Tue May 27 18:14:16 2014
@@ -49,12 +49,12 @@ import java.util.Set;
 public class LazyRealm extends LifecycleBase implements Realm {
     private String realmClass;
     private String properties;
-    private boolean cdi = false;
+    private boolean cdi;
 
-    private volatile Realm delegate = null;
-    private Container container = null;
+    private volatile Realm delegate;
+    private Container container;
 
-    private CreationalContext<Object> creationalContext = null;
+    private CreationalContext<Object> creationalContext;
 
     public void setRealmClass(final String realmClass) {
         this.realmClass = realmClass;

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/TomEEDataSourceRealm.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/TomEEDataSourceRealm.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/TomEEDataSourceRealm.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/TomEEDataSourceRealm.java Tue May 27 18:14:16 2014
@@ -34,7 +34,7 @@ import java.util.Properties;
 public class TomEEDataSourceRealm extends DataSourceRealm {
     private static final String OPENEJB_RESOURCE_PREFIX = "java:openejb/Resource/";
 
-    private String fullName = null;
+    private String fullName;
 
     @Override
     protected Connection open() {

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/routing/SimpleRouter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/routing/SimpleRouter.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/routing/SimpleRouter.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/routing/SimpleRouter.java Tue May 27 18:14:16 2014
@@ -49,7 +49,7 @@ public class SimpleRouter {
     private static final Pattern PATTERN = Pattern.compile("(.*)->(.*)");
 
     private String prefix = "";
-    private ObjectName objectName = null;
+    private ObjectName objectName;
     private Route[] routes = new Route[0];
     private final Map<String, Route> cache = new ConcurrentHashMap<String, Route>();
 

Modified: tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/LegacyAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/LegacyAnnotationProcessor.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/LegacyAnnotationProcessor.java (original)
+++ tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/LegacyAnnotationProcessor.java Tue May 27 18:14:16 2014
@@ -48,7 +48,7 @@ import java.lang.reflect.Modifier;
 
 public class LegacyAnnotationProcessor {
 
-    protected javax.naming.Context context = null;
+    protected javax.naming.Context context;
 
     public LegacyAnnotationProcessor(final javax.naming.Context context) {
         this.context = context;

Modified: tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java (original)
+++ tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java Tue May 27 18:14:16 2014
@@ -53,7 +53,7 @@ public class NamingUtil {
     private static final Map<String,Object> registry = new ConcurrentHashMap<String, Object>();
 
     // these two attributes are used to be able to cleanup quickly the registry (otherwise we need to duplicate a lot of logic)
-    private static StandardContext currentContext = null;
+    private static StandardContext currentContext;
     private static Map<StandardContext, Collection<String>> ID_BY_CONTEXT = new HashMap<StandardContext, Collection<String>>();
 
     public static String getProperty(final Reference ref, final String name) {

Modified: tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (original)
+++ tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Tue May 27 18:14:16 2014
@@ -37,7 +37,7 @@ public class Installer implements Instal
 
     private final Paths paths;
     private Status status = Status.NONE;
-    private boolean force = false;
+    private boolean force;
 
     private static final boolean listenerInstalled;
     private static final boolean agentInstalled;

Modified: tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java (original)
+++ tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java Tue May 27 18:14:16 2014
@@ -28,13 +28,13 @@ public class Configuration {
     private int stopPort = 8005;
     private String host = "localhost";
     protected String dir;
-    private File serverXml = null;
+    private File serverXml;
     private Properties properties;
     private boolean quickSession = true;
-    private boolean skipHttp = false;
+    private boolean skipHttp;
 
     private int httpsPort = 8443;
-    private boolean ssl = false;
+    private boolean ssl;
     private String keystoreFile;
     private String keystorePass;
     private String keystoreType = "JKS";

Modified: tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java (original)
+++ tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java Tue May 27 18:14:16 2014
@@ -210,7 +210,7 @@ public class TomEEDataSourceCreator exte
         private static final Log LOGGER = LogFactory.getLog(TomEEDataSource.class);
         private static final Class<?>[] CONNECTION_POOL_CLASS = new Class<?>[]{ PoolConfiguration.class };
 
-        private ObjectName internalOn = null;
+        private ObjectName internalOn;
 
         public TomEEDataSource(final PoolConfiguration properties, final ConnectionPool pool, final String name) {
             super(readOnly(properties));

Modified: tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java (original)
+++ tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java Tue May 27 18:14:16 2014
@@ -38,7 +38,7 @@ public class LoaderServlet extends HttpS
     private static final long serialVersionUID = 1L;
     
     /**Flag for starting embedded*/
-    private static boolean embedded = false;
+    private static boolean embedded;
 
     /**
      * {@inheritDoc}

Modified: tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java (original)
+++ tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java Tue May 27 18:14:16 2014
@@ -33,8 +33,8 @@ import java.lang.reflect.Method;
 import java.security.Principal;
 
 public class TomcatHelper {
-    private static StandardServer server = null;
-    private static boolean stopping = false;
+    private static StandardServer server;
+    private static boolean stopping;
 
     public static boolean isStopping() {
         return stopping;

Modified: tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/JMXServerListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/JMXServerListener.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/JMXServerListener.java (original)
+++ tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/JMXServerListener.java Tue May 27 18:14:16 2014
@@ -31,13 +31,13 @@ import java.lang.management.ManagementFa
 public class JMXServerListener implements LifecycleListener {
     private static final Log LOGGER = LogFactory.getLog(JMXServerListener.class);
 
-    private String protocol = null; // default if null is jmxmp
-    private String host = null; // if null localhost
+    private String protocol; // default if null is jmxmp
+    private String host; // if null localhost
     private int port = -1;
-    private String urlPath = null; // if null empty
+    private String urlPath; // if null empty
 
-    private JMXConnectorServer server = null;
-    private JMXServiceURL serviceURL = null;
+    private JMXConnectorServer server;
+    private JMXServiceURL serviceURL;
 
     @Override
     public synchronized void lifecycleEvent(final LifecycleEvent event) {

Modified: tomee/tomee/trunk/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/installer/Runner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/installer/Runner.java?rev=1597843&r1=1597842&r2=1597843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/installer/Runner.java (original)
+++ tomee/tomee/trunk/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/installer/Runner.java Tue May 27 18:14:16 2014
@@ -36,8 +36,8 @@ public class Runner {
     private String catalinaBase = System.getProperty("catalina.base");
     private String serverXmlFile = System.getProperty("catalina.base") + "/conf/server.xml";
 
-    private static List<Map<String, String>> installerResults = null;
-    private static org.apache.tomee.installer.Status installerStatus = null;
+    private static List<Map<String, String>> installerResults;
+    private static org.apache.tomee.installer.Status installerStatus;
 
     public Runner(final InstallerInterface installer) {
         this.installer = installer;