# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /home/oleksiys/Projects/glassfish/3.1.1/admingui/common
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: src/main/java/org/glassfish/admingui/common/handlers/RestApiHandlers.java
--- src/main/java/org/glassfish/admingui/common/handlers/RestApiHandlers.java Base (BASE)
+++ src/main/java/org/glassfish/admingui/common/handlers/RestApiHandlers.java Locally Modified (Based On LOCAL)
@@ -136,14 +136,20 @@
})
public static void checkIfEndPointExist(HandlerContext handlerCtx) {
boolean result = false;
+ RestResponse response = null;
try {
- result = get((String) handlerCtx.getInputValue("endpoint")).isSuccess();
+ response = get((String) handlerCtx.getInputValue("endpoint"));
+ result = response.isSuccess();
}catch(Exception ex){
GuiUtil.getLogger().info("checkIfEnpointExist failed.");
if (GuiUtil.getLogger().isLoggable(Level.FINE)){
ex.printStackTrace();
}
+ } finally {
+ if (response != null) {
+ response.close();
}
+ }
\ No newline at end of file
handlerCtx.setOutputValue("exists", result);
}
Index: src/main/java/org/glassfish/admingui/common/util/RestResponse.java
--- src/main/java/org/glassfish/admingui/common/util/RestResponse.java Base (BASE)
+++ src/main/java/org/glassfish/admingui/common/util/RestResponse.java Locally Modified (Based On LOCAL)
@@ -115,6 +115,8 @@
*
*/
public abstract Map getResponse();
+
+ public abstract void close();
}
@@ -473,4 +475,9 @@
return list;
}
+ @Override
+ public void close() {
+ response.close();
}
+
+}
Index: src/main/java/org/glassfish/admingui/common/util/RestUtil.java
--- src/main/java/org/glassfish/admingui/common/util/RestUtil.java Base (BASE)
+++ src/main/java/org/glassfish/admingui/common/util/RestUtil.java Locally Modified (Based On LOCAL)
@@ -244,12 +244,19 @@
}
public static Map getAttributesMap(String endpoint) {
- RestResponse response = get(endpoint);
+ RestResponse response = null;
+ try {
+ response = get(endpoint);
if (!response.isSuccess()) {
return new HashMap();
}
return getEntityAttrs(endpoint, "entity");
+ } finally {
+ if (response != null) {
+ response.close();
}
+ }
+ }
public static Map getEntityAttrs(String endpoint, String key) {
Map valueMap = new HashMap();
@@ -655,13 +662,19 @@
}
public static Boolean doesProxyExist(String endpoint) {
+ RestResponse response = null;
try {
- if (RestUtil.get(endpoint).isSuccess()) {
+ response = RestUtil.get(endpoint);
+ if (response.isSuccess()) {
return true;
}
} catch (Exception e) {
return false;
+ } finally {
+ if (response != null) {
+ response.close();
}
+ }
return false;
}
Index: src/test/java/org/glassfish/admingui/common/test/RestResponseTest.java
--- src/test/java/org/glassfish/admingui/common/test/RestResponseTest.java Base (BASE)
+++ src/test/java/org/glassfish/admingui/common/test/RestResponseTest.java Locally Modified (Based On LOCAL)
@@ -90,4 +90,8 @@
public Map getResponse() {
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public void close() {
}
+}