Skip to content

Commit e769c4b

Browse files
committed
TRUNK-6188 fix failing tests
1 parent 2900d34 commit e769c4b

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

api-common/src/main/java/org/openmrs/module/metadatasharing/serializer/MetadataSerializer.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.apache.commons.logging.LogFactory;
2020
import org.openmrs.BaseOpenmrsObject;
2121
import org.openmrs.User;
22+
import org.openmrs.api.APIException;
2223
import org.openmrs.api.context.Context;
2324
import org.openmrs.module.metadatasharing.ExportedPackage;
2425
import org.openmrs.module.metadatasharing.Item;
@@ -185,15 +186,20 @@ protected MapperWrapper wrapMapper(MapperWrapper next) {
185186
}
186187

187188
private void setupXStreamSecurity(XStream xstream) {
188-
SimpleXStreamSerializer serializer = Context.getRegisteredComponent("simpleXStreamSerializer", SimpleXStreamSerializer.class);
189-
if (serializer != null) {
190-
try {
191-
Method method = serializer.getClass().getMethod("initXStream", XStream.class);
192-
method.invoke(serializer, xstream);
193-
}
194-
catch (Exception ex) {
195-
log.error("Failed to set up XStream Security", ex);
189+
try {
190+
SimpleXStreamSerializer serializer = Context.getRegisteredComponent("simpleXStreamSerializer", SimpleXStreamSerializer.class);
191+
if (serializer != null) {
192+
try {
193+
Method method = serializer.getClass().getMethod("initXStream", XStream.class);
194+
method.invoke(serializer, xstream);
195+
}
196+
catch (Exception ex) {
197+
log.error("Failed to set up XStream Security", ex);
198+
}
196199
}
197200
}
201+
catch (APIException ex) {
202+
//Ignore APIException("Error during getting registered component) for platform versions below 2.7.0
203+
}
198204
}
199205
}

0 commit comments

Comments
 (0)