You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2014/04/11 17:46:13 UTC
svn commit: r1586693 - in /jmeter/trunk: src/core/org/apache/jmeter/
src/core/org/apache/jmeter/engine/ src/core/org/apache/jmeter/gui/action/
src/jorphan/org/apache/jorphan/collections/
src/reports/org/apache/jmeter/report/gui/action/ xdocs/
Author: sebb
Date: Fri Apr 11 15:46:12 2014
New Revision: 1586693
URL: http://svn.apache.org/r1586693
Log:
HashTree and ListedHashTree fail to compile with Java 8
Rename replace as replaceKey to avoid clash with Java 8 Map.replace(K,V) mew method
Bugzilla Id: 56360
Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1586693&r1=1586692&r2=1586693&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Fri Apr 11 15:46:12 2014
@@ -860,7 +860,7 @@ public class JMeter implements JMeterPlu
HashTree replacementTree = rc.getReplacementSubTree();
if (replacementTree != null) {
convertSubTree(replacementTree);
- tree.replace(item, rc);
+ tree.replaceKey(item, rc);
tree.set(rc, replacementTree);
}
}
@@ -885,14 +885,14 @@ public class JMeter implements JMeterPlu
HashTree replacementTree = rc.getReplacementSubTree();
if (replacementTree != null) {
convertSubTree(replacementTree);
- tree.replace(item, rc);
+ tree.replaceKey(item, rc);
tree.set(rc, replacementTree);
}
}
} else { // Not a ReplaceableController
convertSubTree(tree.getTree(item));
TestElement testElement = item.getTestElement();
- tree.replace(item, testElement);
+ tree.replaceKey(item, testElement);
}
} else { // Not enabled
tree.remove(item);
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java?rev=1586693&r1=1586692&r2=1586693&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java Fri Apr 11 15:46:12 2014
@@ -62,7 +62,7 @@ public class ConvertListeners implements
// Used for remote notification of threads start/stop,see BUG 54152
try {
RemoteThreadsListenerWrapper wrapper = new RemoteThreadsListenerWrapper(new RemoteThreadsListenerImpl());
- subTree.replace(item, wrapper);
+ subTree.replaceKey(item, wrapper);
} catch (RemoteException e) {
log.error("Error replacing "+RemoteThreadsListenerTestElement.class.getName()
+" by wrapper:"+RemoteThreadsListenerWrapper.class.getName(), e);
@@ -78,13 +78,13 @@ public class ConvertListeners implements
RemoteSampleListener rtl = new RemoteSampleListenerImpl(item);
if (item instanceof TestStateListener && item instanceof SampleListener) { // TL - all
RemoteListenerWrapper wrap = new RemoteListenerWrapper(rtl);
- subTree.replace(item, wrap);
+ subTree.replaceKey(item, wrap);
} else if (item instanceof TestStateListener) {
RemoteTestListenerWrapper wrap = new RemoteTestListenerWrapper(rtl);
- subTree.replace(item, wrap);
+ subTree.replaceKey(item, wrap);
} else if (item instanceof SampleListener) {
RemoteSampleListenerWrapper wrap = new RemoteSampleListenerWrapper(rtl);
- subTree.replace(item, wrap);
+ subTree.replaceKey(item, wrap);
} else {
log.warn("Could not replace Remotable item "+item.getClass().getName());
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=1586693&r1=1586692&r2=1586693&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Fri Apr 11 15:46:12 2014
@@ -211,7 +211,7 @@ public class Save implements Command {
JMeterTreeNode item = (JMeterTreeNode) iter.next();
convertSubTree(tree.getTree(item));
TestElement testElement = item.getTestElement(); // requires JMeterTreeNode
- tree.replace(item, testElement);
+ tree.replaceKey(item, testElement);
}
}
}
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=1586693&r1=1586692&r2=1586693&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java Fri Apr 11 15:46:12 2014
@@ -763,7 +763,7 @@ public class HashTree implements Seriali
* Finds the given current key, and replaces it with the given new key. Any
* tree structure found under the original key is moved to the new key.
*/
- public void replace(Object currentKey, Object newKey) {
+ public void replaceKey(Object currentKey, Object newKey) {
HashTree tree = getTree(currentKey);
data.remove(currentKey);
data.put(newKey, tree);
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java?rev=1586693&r1=1586692&r2=1586693&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java Fri Apr 11 15:46:12 2014
@@ -116,7 +116,7 @@ public class ListedHashTree extends Hash
/** {@inheritDoc} */
@Override
- public void replace(Object currentKey, Object newKey) {
+ public void replaceKey(Object currentKey, Object newKey) {
HashTree tree = getTree(currentKey);
data.remove(currentKey);
data.put(newKey, tree);
Modified: jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java?rev=1586693&r1=1586692&r2=1586693&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java Fri Apr 11 15:46:12 2014
@@ -127,7 +127,7 @@ public class ReportSave implements Comma
ReportTreeNode item = (ReportTreeNode) iter.next();
convertSubTree(tree.getTree(item));
TestElement testElement = item.getTestElement();
- tree.replace(item, testElement);
+ tree.replaceKey(item, testElement);
}
}
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1586693&r1=1586692&r2=1586693&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Apr 11 15:46:12 2014
@@ -167,6 +167,7 @@ A workaround is to use a Java 7 update 4
<li><bugzilla>56059</bugzilla> - Older TestBeans incompatible with 2.11 when using TextAreaEditor</li>
<li><bugzilla>56080</bugzilla> - Conversion error com.thoughtworks.xstream.converters.ConversionException with Java 8 Early Access Build</li>
<li><bugzilla>56182</bugzilla> - Can't trigger bsh script using bshclient.jar; socket is closed unexpectedly </li>
+<li><bugzilla>56360</bugzilla> - HashTree and ListedHashTree fail to compile with Java 8</li>
</ul>
<!-- =================== Improvements =================== -->