modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
| 4 -
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
| 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
| 32 +++++-----
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
| 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
| 9 ++
5 files changed, 32 insertions(+), 17 deletions(-)
New commits:
commit 47aff4689a8275d18382a8f0f93d7144cc8f0795
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 31 16:55:49 2012 +0100
Fix compile error
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index 6205576..382a145 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -173,7 +173,7 @@ public class ASConnection {
Result failure = new Result();
failure.setFailureDescription(ste.getMessage());
failure.setOutcome("failure");
-// failure.setThrowable(ste); TODO
+ failure.setRhqThrowable(ste);
JsonNode ret = mapper.valueToTree(failure);
return ret;
@@ -201,7 +201,7 @@ public class ASConnection {
Result failure = new Result();
failure.setFailureDescription(e.getMessage());
failure.setOutcome("failure");
-// failure.setThrowable(e); TODO
+ failure.setRhqThrowable(e);
JsonNode ret = mapper.valueToTree(failure);
return ret;
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 60f819f..8078e15 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -162,7 +162,7 @@ public class BaseServerComponent extends BaseComponent {
* reading, this is a good sign.
*/
if (!res.isSuccess()) {
- if (res.getThrowable()!=null && (res.getThrowable() instanceof
ConnectException || res.getThrowable().getMessage().equals("Connection
refused"))) {
+ if (res.getRhqThrowable()!=null && (res.getRhqThrowable()
instanceof ConnectException || res.getRhqThrowable().getMessage().equals("Connection
refused"))) {
operationResult.setSimpleResult("Success");
log.debug("Got a ConnectionRefused for operation " + name +
" this is considered ok, as the remote server sometimes closes the communications
channel before sending a reply");
}
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
index abf40fa..c87b899 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
@@ -173,6 +173,9 @@ public class DeploymentComponent extends BaseComponent implements
OperationFacet
Operation op = new ReadChildrenResources(address1,"deployment");
ComplexResult cres = getASConnection().executeComplex(op);
+ if (cres==null)
+ return details;
+
if (!cres.isSuccess())
return details;
@@ -181,19 +184,22 @@ public class DeploymentComponent extends BaseComponent implements
OperationFacet
Map<String,Object> deployment = (Map<String, Object>)
deployments.get(key);
log.info("Discover package [" + key + "] for type [" +
type + "]");
- List<Map> contentList = (List<Map>)
deployment.get("content"); // deployments on SG or ManagedServer level have no
hash
- Map<String,Map> hashMap = contentList.get(0);
- Map<String,String> bvMap = hashMap.get("hash");
- String content = bvMap.get("BYTES_VALUE");
- PackageDetailsKey pdKey = new PackageDetailsKey(key,
- content, // no way to obtain the user defined version from the
server
- type.getName(),
- "noarch"
- );
- ResourcePackageDetails detail = new ResourcePackageDetails(pdKey);
- detail.setSHA256(content);
-
- details.add(detail);
+ List<Map> contentList = (List<Map>)
deployment.get("content"); // TODO deployments on SG or ManagedServer level have
no hash
+ if (contentList!=null) {
+
+ Map<String,Map> hashMap = contentList.get(0);
+ Map<String,String> bvMap = hashMap.get("hash");
+ String content = bvMap.get("BYTES_VALUE");
+ PackageDetailsKey pdKey = new PackageDetailsKey(key,
+ content, // no way to obtain the user defined version from the
server
+ type.getName(),
+ "noarch"
+ );
+ ResourcePackageDetails detail = new ResourcePackageDetails(pdKey);
+ detail.setSHA256(content);
+
+ details.add(detail);
+ }
}
return details;
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
index f21e598..b46b108 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
@@ -117,7 +117,7 @@ public class HostControllerComponent extends BaseServerComponent
implements Oper
else {
report.setErrorMessage(res.getFailureDescription());
report.setStatus(CreateResourceStatus.FAILURE);
- report.setException(res.getThrowable());
+ report.setException(res.getRhqThrowable());
}
return report;
}
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
index 8f6cfa0..1c68eca 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
@@ -40,6 +40,8 @@ public class Result {
private boolean success = false;
@JsonProperty("rolled-back")
private boolean rolledBack = false;
+ @JsonIgnore
+ private Throwable rhqThrowable;
/** Record throwsables during low level processing */
@JsonIgnore
@@ -106,6 +108,13 @@ public class Result {
this.throwable = throwable;
}
+ public Throwable getRhqThrowable() {
+ return rhqThrowable;
+ }
+
+ public void setRhqThrowable(Throwable rhqThrowable) {
+ this.rhqThrowable = rhqThrowable;
+ }
@Override
public String toString() {
Show replies by date