You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2015/05/07 18:07:24 UTC
[1/3] [lang] Use enhanced for loop instead of iterator based loop
Repository: commons-lang
Updated Branches:
refs/heads/master 14c2afcd6 -> b14c6e7a5
Use enhanced for loop instead of iterator based loop
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/8ac3334a
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/8ac3334a
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/8ac3334a
Branch: refs/heads/master
Commit: 8ac3334a04928faab627aef4daf4ac51c28a95ef
Parents: 14c2afc
Author: Benedikt Ritter <br...@apache.org>
Authored: Thu May 7 18:04:24 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Thu May 7 18:04:24 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/commons/lang3/ThreadUtilsTest.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/8ac3334a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java b/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
index 88f5e47..8f0ec01 100644
--- a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
@@ -29,11 +29,9 @@ import static org.junit.Assert.assertTrue;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.CountDownLatch;
-//import org.apache.commons.lang3.ThreadUtils.AlwaysTruePredicate;
import org.junit.Test;
/**
@@ -313,8 +311,7 @@ public class ThreadUtilsTest {
final List<Thread> threads = Arrays.asList(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10, t11, t11Doubled);
try {
- for (final Iterator iterator = threads.iterator(); iterator.hasNext();) {
- final Thread thread = (Thread) iterator.next();
+ for (final Thread thread : threads) {
thread.start();
}
assertTrue(ThreadUtils.getAllThreadGroups().size() >= 7);
@@ -324,14 +321,12 @@ public class ThreadUtilsTest {
assertEquals(0, ThreadUtils.findThreadsByName(t4.getName(), threadGroup2.getName()).size());
assertEquals(2, ThreadUtils.findThreadsByName(t11.getName(), threadGroup7.getName()).size());
}finally {
- for (final Iterator iterator = threads.iterator(); iterator.hasNext();) {
- final Thread thread = (Thread) iterator.next();
+ for (final Thread thread : threads) {
thread.interrupt();
thread.join();
}
- for (final Iterator iterator = threadGroups.iterator(); iterator.hasNext();) {
- final ThreadGroup threadGroup = (ThreadGroup) iterator.next();
- if(!threadGroup.isDestroyed()) {
+ for (final ThreadGroup threadGroup : threadGroups) {
+ if (!threadGroup.isDestroyed()) {
threadGroup.destroy();
}
}
[2/3] [lang] Fix potential NPE by checking for object identity
instead of comparing one property only
Posted by br...@apache.org.
Fix potential NPE by checking for object identity instead of comparing one property only
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/6bb87178
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/6bb87178
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/6bb87178
Branch: refs/heads/master
Commit: 6bb871786e563ed82e2b8d26314c22772808fe5d
Parents: 8ac3334
Author: Benedikt Ritter <br...@apache.org>
Authored: Thu May 7 18:06:48 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Thu May 7 18:06:48 2015 +0200
----------------------------------------------------------------------
src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/6bb87178/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java b/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
index 8f0ec01..b0ad310 100644
--- a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
@@ -174,7 +174,7 @@ public class ThreadUtilsTest {
try {
t1.start();
t2.start();
- assertEquals(t1.getName(), ThreadUtils.findThreadById(t1.getId()).getName());
+ assertSame(t1, ThreadUtils.findThreadById(t1.getId()));
assertSame(t2, ThreadUtils.findThreadById(t2.getId()));
} finally {
t1.interrupt();
@@ -261,8 +261,8 @@ public class ThreadUtilsTest {
try {
t1.start();
t2.start();
- assertEquals(t1.getName(), ThreadUtils.findThreadById(t1.getId(),"thread_group_DDZZ99__").getName());
- assertEquals(t2.getName(), ThreadUtils.findThreadById(t2.getId(),"thread_group_DDZZ99__").getName());
+ assertSame(t1, ThreadUtils.findThreadById(t1.getId(),"thread_group_DDZZ99__"));
+ assertSame(t2, ThreadUtils.findThreadById(t2.getId(),"thread_group_DDZZ99__"));
assertNull(ThreadUtils.findThreadById(nonExistingId,"non_existent_thread_group_JJHHZZ__"));
assertNull(ThreadUtils.findThreadById(nonExistingId,"thread_group_DDZZ99__"));
} finally {
[3/3] [lang] Merge branch 'cleanup-threadutils-test'
Posted by br...@apache.org.
Merge branch 'cleanup-threadutils-test'
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/b14c6e7a
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/b14c6e7a
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/b14c6e7a
Branch: refs/heads/master
Commit: b14c6e7a54ef966b72a4fa3511e8723632b72e7e
Parents: 14c2afc 6bb8717
Author: Benedikt Ritter <br...@apache.org>
Authored: Thu May 7 18:07:02 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Thu May 7 18:07:02 2015 +0200
----------------------------------------------------------------------
.../apache/commons/lang3/ThreadUtilsTest.java | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------