Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 30, 2014 · dbd3687 · dbd3687
2 parents 7cd1801 + 20a07ba
commit dbd3687
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
@@ -61,7 +61,7 @@ public abstract class Item<V extends PrismValue> implements Itemable, DebugDumpa
     protected PrismValue parent;
     protected ItemDefinition definition;
     private List<V> values = new ArrayList<V>();
-    private transient Map<String,Object> userData;
+    private transient Map<String,Object> userData = new HashMap<>();;
 
     protected transient PrismContext prismContext;
 
@@ -74,7 +74,6 @@ public abstract class Item<V extends PrismValue> implements Itemable, DebugDumpa
     Item(QName elementName) {
         super();
         this.elementName = elementName;
-        this.userData = new HashMap<String, Object>();
     }
 
     /**
@@ -86,7 +85,6 @@ public abstract class Item<V extends PrismValue> implements Itemable, DebugDumpa
         this.elementName = elementName;
         this.definition = definition;
         this.prismContext = prismContext;
-        this.userData = new HashMap<String, Object>();
     }
 
     /**

diff --git a/samples/resources/csvfile/midpoint-flatfile-bulk-action.csv b/samples/resources/csvfile/midpoint-flatfile-bulk-action.csv
@@ -1,11 +1,11 @@
 "id","firstname","lastname","disabled","password"
-"bester01","Besti","Bestini","false","q9kwb"
-"bester02","Besti","Bestini","false","HCLPS"
-"bester03","Besti","Bestini","false","tjQec"
-"tester01","Testi","Testini","false","5SlwR"
-"tester02","Testi","Testini","false","0ROh7"
-"tester03","Testi","Testini","false","yL1PS"
-"tester04","Testi","Testini","false","ppKiC"
-"tester05","Testi","Testini","false","LjZT4"
+"btester01","Besti","Bestini","false","q9kwb"
+"btester02","Besti","Bestini","false","HCLPS"
+"btester03","Besti","Bestini","false","tjQec"
+"atester01","Testi","Testini","false","5SlwR"
+"atester02","Testi","Testini","false","0ROh7"
+"atester03","Testi","Testini","false","yL1PS"
+"atester04","Testi","Testini","false","ppKiC"
+"atester05","Testi","Testini","false","LjZT4"