Author: sebb
Date: Wed Apr 9 20:54:20 2008
New Revision: 646636
URL: http://svn.apache.org/viewvc?rev=646636&view=rev
Log:
Allow for bug in XStream 1.3: JVM.bestReflectionProvider() method
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java?rev=646636&r1=646635&r2=646636&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
Wed Apr 9 20:54:20 2008
@@ -22,6 +22,7 @@
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import
com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
import com.thoughtworks.xstream.converters.reflection.ReflectionConverter;
import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
import com.thoughtworks.xstream.core.JVM;
@@ -38,7 +39,17 @@
*/
public class SampleSaveConfigurationConverter extends ReflectionConverter {
- private static final ReflectionProvider rp = new
JVM().bestReflectionProvider();
+ private static final ReflectionProvider rp;
+
+ static {
+ ReflectionProvider tmp;
+ try {
+ tmp = new JVM().bestReflectionProvider();
+ } catch (NullPointerException e) {// Bug in above method
+ tmp = new PureJavaReflectionProvider();
+ }
+ rp = tmp;
+ }
private static final String TRUE = "true"; // $NON-NLS-1$
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
