modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
| 7 +++----
modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
| 5 +++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
| 2 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
| 2 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
| 3 ++-
5 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit df18b71df2d5114d9edc8a26ad42e0d7a9036eb2
Author: Ian Springer <ispringer(a)apptegic.com>
Date: Tue Mar 26 09:48:20 2013 -0400
do not pass not-yet-fully-initialized "this" reference to
GroupOperationHistory.addResourceOperationHistory() in ResourceOperationHistory's
constructor, as the GWT compiler fails when it sees this (at least in my OS X 10.7.5,
Oracle JDK 1.7.0_17 environment)
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
index 08c29be..08611ac 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
@@ -126,12 +126,11 @@ public class ResourceOperationHistory extends OperationHistory {
protected ResourceOperationHistory() {
}
- public ResourceOperationHistory(String jobName, String jobGroup, String subjectName,
- OperationDefinition operationDefinition, Configuration parameters, Resource
resource,
- GroupOperationHistory groupHistory) {
+ public ResourceOperationHistory(
+ String jobName, String jobGroup, String subjectName,
+ OperationDefinition operationDefinition, Configuration parameters, Resource
resource) {
super(jobName, jobGroup, subjectName, operationDefinition, parameters);
this.resource = resource;
- setGroupOperationHistory(groupHistory);
}
public Resource getResource() {
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
index 34837a1..6ec38e5 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
@@ -285,7 +285,8 @@ public class OperationHistoryTest extends AbstractEJB3Test {
private ResourceOperationHistory
createGroupIndividualResourceHistory(GroupOperationHistory g1) {
ResourceOperationHistory r2 = new ResourceOperationHistory("job3" +
System.currentTimeMillis(), "group3",
- "user", newOperation, null, newResource, g1);
+ "user", newOperation, null, newResource);
+ r2.setGroupOperationHistory(g1);
r2.setStartedTime();
em.persist(r2);
return r2;
@@ -300,7 +301,7 @@ public class OperationHistoryTest extends AbstractEJB3Test {
private ResourceOperationHistory createIndividualResourceHistory() {
ResourceOperationHistory r1 = new ResourceOperationHistory("job1" +
System.currentTimeMillis(), "group1",
- "user", newOperation, null, newResource, null);
+ "user", newOperation, null, newResource);
r1.setStartedTime();
em.persist(r1);
return r1;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
index 4bc457e..5b3b374 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
@@ -149,7 +149,7 @@ public class ResourceOperationHistoryDataSource extends
@Override
protected ResourceOperationHistory createOperationHistory() {
- return new ResourceOperationHistory(null, null, null, null, null, null, null);
+ return new ResourceOperationHistory(null, null, null, null, null, null);
}
@Override
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
index df1e09e..dc5e887 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
@@ -431,7 +431,7 @@ public class OperationHistoryDataSource extends
ResourceOperationHistory resourceOperationHistory = new
ResourceOperationHistory(null, null,
from.getAttribute(Field.SUBJECT),
(OperationDefinition) from.getAttributeAsObject(Field.OPERATION_DEFINITION),
- (Configuration) from.getAttributeAsObject(Field.PARAMETERS), resource,
null);
+ (Configuration) from.getAttributeAsObject(Field.PARAMETERS), resource);
resourceOperationHistory.setId(from.getAttributeAsInt(Field.ID));
return resourceOperationHistory;
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
index 955de7a..6982d58 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
@@ -97,7 +97,8 @@ public abstract class OperationJob implements Job {
ResourceOperationHistory history;
history = new ResourceOperationHistory(jobName, jobGroup,
schedule.getSubject().getName(), op, parameters,
- schedule.getResource(), groupHistory);
+ schedule.getResource());
+ history.setGroupOperationHistory(groupHistory);
// persist the results of the initial create
ResourceOperationHistory persisted;