You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2013/11/27 13:39:39 UTC

svn commit: r1546015 - in /tomee/tomee/trunk/container/openejb-core/src/main: config/pmd/openejb-empty.xml java/org/apache/openejb/util/JuliLogStream.java java/org/apache/openejb/util/Pool.java

Author: tveronezi
Date: Wed Nov 27 12:39:39 2013
New Revision: 1546015

URL: http://svn.apache.org/r1546015
Log:
https://issues.apache.org/jira/browse/OPENEJB-2051
PMD EmptyWhileStmt

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml?rev=1546015&r1=1546014&r2=1546015&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml Wed Nov 27 12:39:39 2013
@@ -12,7 +12,6 @@
   <rule ref="rulesets/java/empty.xml">
     <exclude name="EmptyCatchBlock"/>
     <exclude name="EmptyIfStmt"/>
-    <exclude name="EmptyWhileStmt"/>
   </rule>
 
   <!-- overriding EmptyCatchBlock -->

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=1546015&r1=1546014&r2=1546015&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 Wed Nov 27 12:39:39 2013
@@ -184,7 +184,7 @@ public class JuliLogStream implements Lo
                 }
 
                 // Skip any internal OpenEJB Logger call
-                while (++i < elements.length && elements[i].getClassName().equals(current)) {
+                while (++i < elements.length && elements[i].getClassName().equals(current)) { //NOPMD
                     // do nothing
                 }
 

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=1546015&r1=1546014&r2=1546015&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 Wed Nov 27 12:39:39 2013
@@ -396,8 +396,8 @@ 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()) ;
-        while (minimum.tryAcquire()) ;
+        while (instances.tryAcquire()) ; //NOPMD
+        while (minimum.tryAcquire()) ; //NOPMD
 
         // Stop the sweeper thread
         stop();
@@ -407,7 +407,7 @@ public class Pool<T> {
         sweeper.run();
 
         // Drain all leases
-        if (!(available instanceof Overdraft)) while (available.tryAcquire()) ;
+        if (!(available instanceof Overdraft)) while (available.tryAcquire()) ; //NOPMD
 
         // Wait for any pending discards
         return out.await(timeout, unit);