You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2014/06/12 16:29:46 UTC

svn commit: r1602176 - in /sling/trunk/tooling/ide: eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServerModuleDecorator.java

Author: stefanegli
Date: Thu Jun 12 14:29:46 2014
New Revision: 1602176

URL: http://svn.apache.org/r1602176
Log:
SLING-3130 : completely disabling the bundle state code - if it's not shown it doesn't make sense to execute it

Modified:
    sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java
    sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServerModuleDecorator.java

Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java?rev=1602176&r1=1602175&r2=1602176&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java Thu Jun 12 14:29:46 2014
@@ -121,7 +121,8 @@ public class BundleStateHelper {
 			if (resultCode!=HttpStatus.SC_OK) {
 				return " ["+resultCode+"]";
 			}
-            String responseBodyAsString = method.getResponseBodyAsString(16*1024); // relevant data is in first 1k anyway
+            String responseBodyAsString = method.getResponseBodyAsString(); // explicitly not limiting buffer here - even though this results in a warning
+                                                                            // cannot know the size of a bundle in advance, large bundles can have large json
 			JSONObject result = new JSONObject(responseBodyAsString);
             JSONArray dataArray = (JSONArray) result.get("data");
             JSONObject firstElement = (JSONObject) dataArray.get(0);

Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServerModuleDecorator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServerModuleDecorator.java?rev=1602176&r1=1602175&r2=1602176&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServerModuleDecorator.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServerModuleDecorator.java Thu Jun 12 14:29:46 2014
@@ -30,10 +30,10 @@ public class ServerModuleDecorator exten
 			return;
 		}
 		IServerModule serverModule = (IServerModule)element;
-		Object state = BundleStateHelper.getBundleState(serverModule.getServer(), serverModule.getModule()[0].getProject());
-		if (state==null) {
-			return;
-		}
+//		Object state = BundleStateHelper.getBundleState(serverModule.getServer(), serverModule.getModule()[0].getProject());
+//		if (state==null) {
+//			return;
+//		}
 		//decoration.addSuffix(String.valueOf(state));
 	}