Merge branch 'master' of https://github.com/apache/commons-pool.git

apache · Jan 22, 2025 · 9ff6719 · 9ff6719
2 parents b235a22 + a4ba4a6
commit 9ff6719
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/src/assembly/src-tar-gz.xml b/src/assembly/src-tar-gz.xml
@@ -25,16 +25,12 @@
     <fileSets>
         <fileSet>
             <includes>
-                <include>build.xml</include>
-                <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
                 <include>license-header.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
                 <include>README.txt</include>
                 <include>RELEASE-NOTES.txt</include>
-                <include>findbugs-exclude-filter.xml</include>
-                <include>build.properties.sample</include>
             </includes>
             <lineEnding>lf</lineEnding>
         </fileSet>
@@ -73,4 +69,3 @@
         </fileSet> 
     </fileSets>
 </assembly>
-
diff --git a/src/assembly/src-zip.xml b/src/assembly/src-zip.xml
@@ -25,16 +25,12 @@
     <fileSets>
         <fileSet>
             <includes>
-                <include>build.xml</include>
-                <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
                 <include>license-header.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
                 <include>README.txt</include>
                 <include>RELEASE-NOTES.txt</include>
-                <include>findbugs-exclude-filter.xml</include>
-                <include>build.properties.sample</include>
             </includes>
             <lineEnding>crlf</lineEnding>
         </fileSet>

diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
@@ -71,7 +71,8 @@
       <property name="ordered" value="true"/>
       <property name="separated" value="true"/>
     </module>
-
+    <module name="ParenPad" />
+    <module name="TypecastParenPad" />
   </module>
 
   <!-- Require package Javadoc -->

diff --git a/src/main/java/org/apache/commons/pool3/impl/LinkedBlockingDeque.java b/src/main/java/org/apache/commons/pool3/impl/LinkedBlockingDeque.java
@@ -953,13 +953,12 @@ public E pollLast() {
      * @return the unlinked element
      * @throws InterruptedException if the current thread is interrupted
      */
-    public E pollLast(final Duration timeout)
-        throws InterruptedException {
+    public E pollLast(final Duration timeout) throws InterruptedException {
         long nanos = timeout.toNanos();
         lock.lockInterruptibly();
         try {
             E x;
-            while ( (x = unlinkLast()) == null) {
+            while ((x = unlinkLast()) == null) {
                 if (nanos <= 0) {
                     return null;
                 }
@@ -1292,7 +1291,7 @@ public E takeFirst() throws InterruptedException {
         lock.lock();
         try {
             E x;
-            while ( (x = unlinkFirst()) == null) {
+            while ((x = unlinkFirst()) == null) {
                 notEmpty.await();
             }
             return x;
@@ -1312,7 +1311,7 @@ public E takeLast() throws InterruptedException {
         lock.lock();
         try {
             E x;
-            while ( (x = unlinkLast()) == null) {
+            while ((x = unlinkLast()) == null) {
                 notEmpty.await();
             }
             return x;