modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 38 ----------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java | 5 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 13 ---
3 files changed, 6 insertions(+), 50 deletions(-)
New commits:
commit 967c37242702d5774e3f313b07dc5090e4f47eb9
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed May 26 18:34:41 2010 -0400
moving incorrect em.persist and put NPE check in.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 4439771..ae7c079 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -1278,23 +1278,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
PackageVersion newPackageVersion = new PackageVersion(existingPackage, version, architecture);
newPackageVersion.setDisplayName(existingPackage.getName());
- // PackageBits bits = loadPackageBits(packageBitStream);
- // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING
- // Write the content into the newly created package version. This may eventually move, but for now we'll just
- // use the byte array in the package version to store the bits.
- byte[] packageBits;
- try {
- packageBits = StreamUtil.slurp(packageBitStream);
- } catch (RuntimeException re) {
- throw new RuntimeException("Error reading in the package file", re);
- }
-
- PackageBits bits = new PackageBits();
- try {
- bits.setBits(packageBits);
- } catch (Exception e) {
- log.error("Error savinf the package.", e);
- }
+ PackageBits bits = loadPackageBits(packageBitStream);
newPackageVersion.setPackageBits(bits);
newPackageVersion.setFileSize((long) bits.getBits().length);
@@ -1612,24 +1596,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
}
//get the data and persist/merge packageVersion
- // PackageBits bits = loadPackageBits(packageBitStream);
- // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING
- // Write the content into the newly created package version. This may eventually move, but for now we'll just
- // use the byte array in the package version to store the bits.
- byte[] packageBits;
- try {
- packageBits = StreamUtil.slurp(packageBitStream);
- } catch (RuntimeException re) {
- throw new RuntimeException("Error reading in the package file", re);
- }
-
- PackageBits bits = new PackageBits();
- try {
- bits.setBits(packageBits);
- } catch (Exception e) {
- log.error("Error savinf the package.", e);
- }
-
+ PackageBits bits = loadPackageBits(packageBitStream);
packageVersion.setPackageBits(bits);
//populate extra details, persist
@@ -1668,7 +1635,6 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
bits = new PackageBits();
try {
bits.setBits(packageBits);
- entityManager.persist(bits);
} catch (Exception e) {
log.error("Error saving the package.", e);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java
index 9d4a4bc..a00a40c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java
@@ -95,7 +95,10 @@ public class ContentManagerHelper {
details.setMetadata(packageVersion.getMetadata());
details.setSHA256(packageVersion.getSHA256());
details.setShortDescription(packageVersion.getShortDescription());
- details.setInstallationTimestamp(packageVersion.getFileCreatedDate());
+ Long created = packageVersion.getFileCreatedDate();
+ if (created != null) {
+ details.setInstallationTimestamp(created.longValue());
+ }
return details;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
index 438bb8a..d8651c9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
@@ -530,19 +530,6 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
packageVersionNumber, architectureId, packageBitStream, packageUploadDetails, newResourceTypeId);
}
- // //check that Configuration is persisted correctly.
- // if (deploymentTimeConfiguration.getId() > 0) {
- // entityManager.merge(deploymentTimeConfiguration);
- // } else {
- // entityManager.persist(deploymentTimeConfiguration);
- // }
- // //check that Configuration is persisted correctly.
- // if (pluginConfiguration.getId() > 0) {
- // entityManager.merge(pluginConfiguration);
- // } else {
- // entityManager.persist(pluginConfiguration);
- // }
-
// Persist in separate transaction so it is committed immediately, before the request is sent to the agent
CreateResourceHistory persistedHistory = resourceFactoryManager.persistCreateHistory(user, parentResourceId,
newResourceTypeId, newResourceName, packageVersion, deploymentTimeConfiguration);