Merge pull request #1374 from digitaldan/rest-memory-issues2

Rest memory issues to address #765
openhab · Aug 29, 2014 · 9435ad4 · 9435ad4
2 parents 741f115 + 154a006
commit 9435ad4
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/bundles/io/org.openhab.io.rest.lib/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.rest.lib/META-INF/MANIFEST.MF
@@ -20,9 +20,9 @@ Bundle-ClassPath: lib/jackson-core-asl-1.9.2.jar,
  lib/atmosphere-compat-jbossweb-2.0.1.jar,
  lib/atmosphere-compat-tomcat-2.0.1.jar,
  lib/atmosphere-compat-tomcat7-2.0.1.jar,
- lib/atmosphere-annotations-2.0.7.jar,
- lib/atmosphere-jersey-2.0.7.jar,
- lib/atmosphere-runtime-2.0.7.jar
+ lib/atmosphere-annotations-2.0.9.jar,
+ lib/atmosphere-jersey-2.0.9.jar,
+ lib/atmosphere-runtime-2.0.9.jar
 Import-Package: com.sun.jersey.api.core,
  com.sun.jersey.api.json,
  com.sun.jersey.core.osgi,

diff --git a/bundles/io/org.openhab.io.rest.lib/build.properties b/bundles/io/org.openhab.io.rest.lib/build.properties
@@ -14,6 +14,6 @@ bin.includes = META-INF/,\
                lib/atmosphere-compat-jbossweb-2.0.1.jar,\
                lib/atmosphere-compat-tomcat-2.0.1.jar,\
                lib/atmosphere-compat-tomcat7-2.0.1.jar,\
-               lib/atmosphere-annotations-2.0.7.jar,\
-               lib/atmosphere-jersey-2.0.7.jar,\
-               lib/atmosphere-runtime-2.0.7.jar
+               lib/atmosphere-annotations-2.0.9.jar,\
+               lib/atmosphere-jersey-2.0.9.jar,\
+               lib/atmosphere-runtime-2.0.9.jar
diff --git a/....lib/lib/atmosphere-annotations-2.0.7.jar → ....lib/lib/atmosphere-annotations-2.0.9.jar b/....lib/lib/atmosphere-annotations-2.0.7.jar → ....lib/lib/atmosphere-annotations-2.0.9.jar
diff --git a/....rest.lib/lib/atmosphere-jersey-2.0.7.jar → ....rest.lib/lib/atmosphere-jersey-2.0.9.jar b/....rest.lib/lib/atmosphere-jersey-2.0.7.jar → ....rest.lib/lib/atmosphere-jersey-2.0.9.jar
diff --git a/...rest.lib/lib/atmosphere-runtime-2.0.7.jar → ...rest.lib/lib/atmosphere-runtime-2.0.9.jar b/...rest.lib/lib/atmosphere-runtime-2.0.7.jar → ...rest.lib/lib/atmosphere-runtime-2.0.9.jar
diff --git a/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/RESTApplication.java b/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/RESTApplication.java
@@ -198,7 +198,7 @@ private Dictionary<String, String> getJerseyServletParams() {
         jerseyServletParams.put("org.atmosphere.cpr.AtmosphereInterceptor", "org.atmosphere.interceptor.DefaultHeadersInterceptor,org.atmosphere.interceptor.AndroidAtmosphereInterceptor,org.atmosphere.interceptor.SSEAtmosphereInterceptor,org.atmosphere.interceptor.JSONPAtmosphereInterceptor,org.atmosphere.interceptor.JavaScriptProtocol,org.atmosphere.interceptor.OnDisconnectInterceptor");
 //      The BroadcasterCache is set in ResourceStateChangeListener.registerItems(), because otherwise
 //      it gets somehow overridden by other registered servlets (e.g. the CV-bundle)
-//        jerseyServletParams.put("org.atmosphere.cpr.broadcasterCacheClass", "org.atmosphere.cache.UUIDBroadcasterCache");
+        jerseyServletParams.put("org.atmosphere.cpr.broadcasterCacheClass", "org.atmosphere.cache.UUIDBroadcasterCache");
         jerseyServletParams.put("org.atmosphere.cpr.broadcasterLifeCyclePolicy", "IDLE_DESTROY");
         jerseyServletParams.put("org.atmosphere.cpr.CometSupport.maxInactiveActivity", "3000000");
 

diff --git a/...est/src/main/java/org/openhab/io/rest/internal/listeners/ResourceStateChangeListener.java b/...est/src/main/java/org/openhab/io/rest/internal/listeners/ResourceStateChangeListener.java
@@ -67,7 +67,7 @@ public static ConcurrentMap<String, Object> getMap() {
 	}
 
 	public void registerItems(){
-		broadcaster.getBroadcasterConfig().setBroadcasterCache(new UUIDBroadcasterCache());
+		//broadcaster.getBroadcasterConfig().setBroadcasterCache(new UUIDBroadcasterCache());
 
 		broadcaster.getBroadcasterConfig().addFilter(new PerRequestBroadcastFilter() {