Merge remote-tracking branch 'home/master'

Evolveum · Jul 11, 2014 · 257db67 · 257db67
2 parents 4b08462 + 4a1a9a1
commit 257db67
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
@@ -126,6 +126,17 @@ public PrismContainerValue(OriginType type, Objectable source, PrismContainerabl
         setPrismContext(prismContext);
     }
 
+    @Override
+    public PrismContext getPrismContext() {
+        if (prismContext != null) {
+            return prismContext;
+        }
+        if (getParent() != null) {
+            return getParent().getPrismContext();
+        }
+        return null;
+    }
+
     /**
      * Returns a set of items that the property container contains. The items may be properties or inner property containers.
      * <p/>

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
@@ -234,7 +234,7 @@ public static <T extends Containerable> boolean setFieldContainerValue(PrismCont
 	        		// This value is already part of another prism. We need to clone it to add it here.
 	        		fieldContainerValue = fieldContainerValue.clone();
 	        	}
-	            fieldContainer = new PrismContainer<T>(fieldName);
+	            fieldContainer = new PrismContainer<T>(fieldName, parent.getPrismContext());
 	            fieldContainer.add(fieldContainerValue);
 	            if (parent.getParent() == null) {
 	                parent.add(fieldContainer);