Author: robbie
Date: Thu Apr 4 11:33:30 2013
New Revision: 1464463
URL: http://svn.apache.org/r1464463
Log:
QPID-4694: ensure that any IDs generated at startup are saved immediately,
rather than waiting for the user to edit something that prompts the save to
occur
merged from trunk r1463917
Modified:
qpid/branches/0.22/qpid/java/ (props changed)
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
Propchange: qpid/branches/0.22/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1463917
Modified:
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java?rev=1464463&r1=1464462&r2=1464463&view=diff
==============================================================================
---
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
(original)
+++
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
Thu Apr 4 11:33:30 2013
@@ -28,6 +28,10 @@ public class JsonConfigurationEntryStore
initialiseStore(_storeFile, initialStore);
}
load(fileToURL(_storeFile));
+ if(isGeneratedObjectIdDuringLoad())
+ {
+ saveAsTree(_storeFile);
+ }
}
@Override
Modified:
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java?rev=1464463&r1=1464462&r2=1464463&view=diff
==============================================================================
---
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
(original)
+++
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
Thu Apr 4 11:33:30 2013
@@ -75,6 +75,8 @@ public class MemoryConfigurationEntrySto
private String _storeLocation;
private UUID _rootId;
+ private boolean _generatedObjectIdDuringLoad;
+
protected MemoryConfigurationEntryStore()
{
_objectMapper = new ObjectMapper();
@@ -592,6 +594,8 @@ public class MemoryConfigurationEntrySto
{
id = UUIDGenerator.generateBrokerChildUUID(type, name);
}
+
+ _generatedObjectIdDuringLoad = true;
}
else
{
@@ -683,4 +687,8 @@ public class MemoryConfigurationEntrySto
return array;
}
+ protected boolean isGeneratedObjectIdDuringLoad()
+ {
+ return _generatedObjectIdDuringLoad;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
