svn commit: r1733455 - in /jmeter/trunk/src/core/org/apache/jmeter: control/GenericController.java threads/AbstractThreadGroup.java

[sebb]

Author: sebb
Date: Thu Mar  3 12:10:41 2016
New Revision: 1733455

URL: http://svn.apache.org/viewvc?rev=1733455&view=rev
Log:
Redundant type arguments

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=1733455&r1=1733454&r2=1733455&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java Thu 
Mar  3 12:10:41 2016
@@ -56,7 +56,7 @@ public class GenericController extends A
     private transient LinkedList<LoopIterationListener> iterationListeners = 
new LinkedList<>();
 
     // Only create the map if it is required
-    private transient ConcurrentMap<TestElement, Object> children = new 
ConcurrentHashMap<TestElement, Object>();
+    private transient ConcurrentMap<TestElement, Object> children = new 
ConcurrentHashMap<>();
 
     private static final Object DUMMY = new Object();
 
@@ -420,7 +420,7 @@ public class GenericController extends A
     
     protected Object readResolve(){
         iterationListeners = new LinkedList<>();
-        children = new ConcurrentHashMap<TestElement, Object>();
+        children = new ConcurrentHashMap<>();
         subControllersAndSamplers = new ArrayList<>();
 
         return this;

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java?rev=1733455&r1=1733454&r2=1733455&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java 
Thu Mar  3 12:10:41 2016
@@ -46,7 +46,7 @@ public abstract class AbstractThreadGrou
     private static final long serialVersionUID = 240L;
 
     // Only create the map if it is required
-    private transient final ConcurrentMap<TestElement, Object> children = new 
ConcurrentHashMap<TestElement, Object>();
+    private transient final ConcurrentMap<TestElement, Object> children = new 
ConcurrentHashMap<>();
 
     private static final Object DUMMY = new Object();