Merge branch 'master' of github.com:OSBI/saiku

pstoellberger · pstoellberger · commit 670f52adae4a · 2013-08-12T12:47:20.000+02:00
diff --git a/saiku-core/saiku-service/src/main/java/org/saiku/olap/query/MdxQuery.java b/saiku-core/saiku-service/src/main/java/org/saiku/olap/query/MdxQuery.java
@@ -104,7 +104,7 @@ public void setProperties(Properties props) {
 	}
 
 	public Properties getProperties() {
-		Properties props = new Properties(this.properties);
+		Properties props = this.properties;
 		props.put(QueryProperties.KEY_IS_DRILLTHROUGH, isDrillThroughEnabled().toString());
 		props.put("org.saiku.connection.scenario", Boolean.toString(false));
 		try {
diff --git a/saiku-ui b/saiku-ui
@@ -1 +1 @@
-Subproject commit 95143460c63db41714a298bb2d7149e675cd3722
+Subproject commit f6aebdaa4e81b2e25a7a39f5af483ab43e30ab59

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void setProperties(Properties props) {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public Properties getProperties() {`
`107`		`- Properties props = new Properties(this.properties);`
	`107`	`+ Properties props = this.properties;`
`108`	`108`	`props.put(QueryProperties.KEY_IS_DRILLTHROUGH, isDrillThroughEnabled().toString());`
`109`	`109`	`props.put("org.saiku.connection.scenario", Boolean.toString(false));`
`110`	`110`	`try {`