Skip to content

Commit 0d0961b

Browse files
committed
any type permission for clone
1 parent 005f5c7 commit 0d0961b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/java/cern/accsoft/steering/jmad/modeldefs/io/impl/AbstractModelDefinitionPersistenceService.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import cern.accsoft.steering.jmad.util.xml.PersistenceService;
2424
import cern.accsoft.steering.jmad.util.xml.PersistenceServiceException;
2525
import com.thoughtworks.xstream.XStream;
26-
import com.thoughtworks.xstream.security.AnyTypePermission;
2726

2827
public abstract class AbstractModelDefinitionPersistenceService implements ModelDefinitionPersistenceService {
2928
@Override
@@ -95,7 +94,5 @@ protected final void configureXStream(XStream xStream) {
9594

9695
/* The default implementations */
9796
xStream.addDefaultImplementation(ModelPathOffsetsImpl.class, ModelPathOffsets.class);
98-
99-
xStream.addPermission(AnyTypePermission.ANY);
10097
}
10198
}

src/java/cern/accsoft/steering/jmad/util/xml/AbstractXStreamService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public abstract class AbstractXStreamService<T> extends GenericXStreamService<T>
1717
@Override
1818
protected XStream createXStream() {
1919
this.xStream = this.newXStreamInstance();
20-
this.xStream.addPermission(AnyTypePermission.ANY);
2120
this.initializeXStream(this.xStream);
21+
this.xStream.addPermission(AnyTypePermission.ANY);
2222
return this.xStream;
2323
}
2424

src/java/cern/accsoft/steering/jmad/util/xml/CloneUtil.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import com.thoughtworks.xstream.XStream;
2929
import com.thoughtworks.xstream.converters.Converter;
30+
import com.thoughtworks.xstream.security.AnyTypePermission;
3031

3132
/**
3233
* This is a utility class that uses the XStream mechanism to clone objects. Custom converters can be provided in order
@@ -45,6 +46,7 @@ public static <T> T clone(Class<T> clazz, T object) {
4546
XStream xStream = new XStream();
4647
xStream.autodetectAnnotations(true);
4748
xStream.processAnnotations(clazz);
49+
xStream.addPermission(AnyTypePermission.ANY);
4850
return (T) xStream.fromXML(xStream.toXML(object));
4951
}
5052

@@ -54,6 +56,7 @@ public static <T> T clone(Class<T> clazz, T object, Converter converter) {
5456
xStream.registerConverter(converter);
5557
xStream.autodetectAnnotations(true);
5658
xStream.processAnnotations(clazz);
59+
xStream.addPermission(AnyTypePermission.ANY);
5760
return (T) xStream.fromXML(xStream.toXML(object));
5861

5962
}

0 commit comments

Comments
 (0)