You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/29 20:30:48 UTC
[isis] branch master updated: ISIS-2507: fixes infinite loop issue
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 5638a94 ISIS-2507: fixes infinite loop issue
5638a94 is described below
commit 5638a94407011787c67a7978542b4329e4fdc514
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 29 21:30:09 2021 +0100
ISIS-2507: fixes infinite loop issue
---
.../java/org/apache/isis/applib/services/jaxb/JaxbService.java | 9 +--------
.../isis/core/runtimeservices/jaxb/JaxbServiceDefault.java | 5 ++---
.../isis/viewer/wicket/model/models/EntityCollectionModel.java | 1 -
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index 9c3d189..a3f31c5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -31,8 +31,6 @@ import javax.xml.bind.Unmarshaller;
import org.apache.isis.applib.mixins.dto.Dto_downloadXsd;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.debug._Probe;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.commons.internal.resources._Xml;
import lombok.NonNull;
@@ -211,12 +209,7 @@ public interface JaxbService {
for (val entry : _NullSafe.entrySet(unmarshallerProperties)) {
unmarshaller.setProperty(entry.getKey(), entry.getValue());
}
-
- if(xml.contains("<actionOwningType>isis.applib.ConfigurationMenu</actionOwningType>")) {
- _Probe.errOut("+++++++++++\n\n %s", xml);
- _Exceptions.dumpStackTrace();
- }
-
+
configure(unmarshaller);
val pojo = unmarshaller.unmarshal(new StringReader(xml));
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/jaxb/JaxbServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/jaxb/JaxbServiceDefault.java
index 5f8d836..31e0f6f 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/jaxb/JaxbServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/jaxb/JaxbServiceDefault.java
@@ -87,15 +87,14 @@ public class JaxbServiceDefault extends JaxbService.Simple {
final @NonNull JAXBContext jaxbContext,
final String xml,
final Map<String, Object> unmarshallerProperties) throws JAXBException {
-
+
val pojo = super.internalFromXml(jaxbContext, xml, unmarshallerProperties);
if(pojo instanceof DomainObjectList) {
// go around the loop again, so can properly deserialize the contents
val domainObjectList = (DomainObjectList) pojo;
val jaxbContextForList = jaxbContextForObject(domainObjectList);
-
- return internalFromXml(jaxbContextForList, xml, unmarshallerProperties);
+ return super.internalFromXml(jaxbContextForList, xml, unmarshallerProperties);
}
return pojo;
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index a5fef46..f023f6d 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -34,7 +34,6 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.debug._Probe;
import org.apache.isis.commons.internal.factory._InstanceUtil;
import org.apache.isis.core.metamodel.commons.ClassExtensions;
import org.apache.isis.core.metamodel.commons.ClassUtil;