modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 37 +++++++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 24 +++--- 2 files changed, 47 insertions(+), 14 deletions(-)
New commits: commit c24e798945928295db181e53d69d2441fc075379 Merge: 4d2c161... 6ae857a... Author: Jay Shaughnessy jshaughn@redhat.com Date: Wed May 26 16:56:51 2010 -0400
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
commit 4d2c16104642e4ba423a2dca91e2a5195312cea5 Author: Simeon Pinder spinder@redhat.com Date: Wed May 26 15:30:40 2010 -0400
take two on regression fix.
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 11f709f..4439771 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,7 +1278,23 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe PackageVersion newPackageVersion = new PackageVersion(existingPackage, version, architecture); newPackageVersion.setDisplayName(existingPackage.getName());
- PackageBits bits = loadPackageBits(packageBitStream); + // 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); + }
newPackageVersion.setPackageBits(bits); newPackageVersion.setFileSize((long) bits.getBits().length); @@ -1596,7 +1612,24 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe }
//get the data and persist/merge packageVersion - PackageBits bits = loadPackageBits(packageBitStream); + // 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); + } + packageVersion.setPackageBits(bits);
//populate extra details, persist 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 3ecd40f..6440fc5 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,18 +530,18 @@ 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); - } + // //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,
rhq-commits@lists.fedorahosted.org