Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [5070] [RHQ-2394] Adding a call to persist the new Configuration object because we were seeing a TransientObjectException,
|
From: <js...@rh...> - 2009-09-02 19:34:17
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [5070] [RHQ-2394] Adding a call to persist the new Configuration object because we were seeing a TransientObjectException,</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5070</dd> <dt>Author</dt> <dd>jsanda</dd> <dt>Date</dt> <dd>2009-09-02 14:34:07 -0500 (Wed, 02 Sep 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-2394] Adding a call to persist the new Configuration object because we were seeing a TransientObjectException, Caused by: org.hibernate.TransientObjectException: object references an unsaved transient instance - save the transient instance before flushing: org.rhq.core.domain.configuration.PropertySimple.configuration -> org.rhq.core.domain.configuration.Configuration which seems to indicate that hibernate was trying to persist a PropertySimple before it's parent Configuration was saved. I have updated ConfigurationManagerBean.completeResourceConfigurationUpdate so that the new Configuration is explicitly persisted, assuring that the child Property objects are not referencing a transient entity.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseremotingscriptssrctestscriptorgrhqenterpriseremotingclitest_ConfigurationManagerjs">rhq/trunk/modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_ConfigurationManager.js</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverconfigurationConfigurationManagerBeanjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseremotingscriptssrctestscriptorgrhqenterpriseremotingclitest_ConfigurationManagerjs"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_ConfigurationManager.js (5069 => 5070)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_ConfigurationManager.js 2009-09-02 19:31:00 UTC (rev 5069) +++ rhq/trunk/modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_ConfigurationManager.js 2009-09-02 19:34:07 UTC (rev 5070) </span><span class="lines">@@ -23,10 +23,10 @@ </span><span class="cx"> rhq.login('rhqadmin', 'rhqadmin'); </span><span class="add">+skippedTests.push('testUpdateResourceGroupConfiguration'); + </span><span class="cx"> executeAllTests(); </span><span class="rem">-skippedTests.push('testUpdateResourceGroupConfiguration'); - </span><span class="cx"> rhq.logout(); function testUpdateResourceConfiguration() { </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverconfigurationConfigurationManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java (5069 => 5070)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java 2009-09-02 19:31:00 UTC (rev 5069) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java 2009-09-02 19:34:07 UTC (rev 5070) </span><span class="lines">@@ -1136,7 +1136,12 @@ </span><span class="cx"> } else if (response.getStatus() == ConfigurationUpdateStatus.SUCCESS) { // link to the newer, persisted configuration object Resource resource = update.getResource(); </span><span class="rem">- resource.setResourceConfiguration(update.getConfiguration().deepCopyWithoutProxies()); </span><span class="add">+ + Configuration updatedConfig = update.getConfiguration().deepCopyWithoutProxies(); + updatedConfig = entityManager.merge(updatedConfig); + + resource.setResourceConfiguration(updatedConfig); + </span><span class="cx"> notifyAlertConditionCacheManager("completeResourceConfigurationUpdate", update); } </span> </pre> </div> </div> </body> </html> |