Merge branch 'develop'

TanyaEf · TanyaEf · commit 81b4c32d63f4 · 2015-08-28T18:27:07.000+03:00
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/DashboardSettings.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/DashboardSettings.java
@@ -14,7 +14,7 @@ public DashboardSettings() {
     }
 
     public DashboardSettings(DashboardSettings other) {
-        this.newItemsRegistry = new LinkedList<ItemRegistry>(other.newItemsRegistry);
+        this.newItemsRegistry = (other.newItemsRegistry != null) ? new LinkedList<ItemRegistry>(other.newItemsRegistry) : null;
     }
 
     public List<ItemRegistry> getNewItemsRegistry() {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public DashboardSettings() {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public DashboardSettings(DashboardSettings other) {`
`17`		`- this.newItemsRegistry = new LinkedList<ItemRegistry>(other.newItemsRegistry);`
	`17`	`+ this.newItemsRegistry = (other.newItemsRegistry != null) ? new LinkedList<ItemRegistry>(other.newItemsRegistry) : null;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public List<ItemRegistry> getNewItemsRegistry() {`