rhmessaging commits: r4001 - store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/util.
by rhmessaging-commits@lists.jboss.org
Author: rgemmell
Date: 2010-06-02 05:26:17 -0400 (Wed, 02 Jun 2010)
New Revision: 4001
Modified:
store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/util/NullApplicationRegistry.java
Log:
Commment out some breakges caused by recent changes to broker, to allow build tasks to succeed
Modified: store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/util/NullApplicationRegistry.java
===================================================================
--- store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/util/NullApplicationRegistry.java 2010-06-01 18:17:24 UTC (rev 4000)
+++ store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/util/NullApplicationRegistry.java 2010-06-02 09:26:17 UTC (rev 4001)
@@ -30,7 +30,7 @@
import org.apache.qpid.server.management.NoopManagedObjectRegistry;
import org.apache.qpid.server.plugins.PluginManager;
import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.security.access.ACLManager;
+//import org.apache.qpid.server.security.access.ACLManager;
import org.apache.qpid.server.security.access.plugins.AllowAll;
import org.apache.qpid.server.security.auth.database.PropertiesPrincipalDatabaseManager;
import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
@@ -67,7 +67,7 @@
_databaseManager = new PropertiesPrincipalDatabaseManager("default", users);
- _accessManager = new ACLManager(_configuration.getSecurityConfiguration(), _pluginManager, AllowAll.FACTORY);
+ // FIXME _accessManager = new ACLManager(_configuration.getSecurityConfiguration(), _pluginManager, AllowAll.FACTORY);
_authenticationManager = new PrincipalDatabaseAuthenticationManager(null, null);
@@ -78,7 +78,7 @@
VirtualHost dummyHost = new VirtualHostImpl(hostConfig,null);
_virtualHostRegistry.registerVirtualHost(dummyHost);
_virtualHostRegistry.setDefaultVirtualHostName("test");
- _pluginManager = new PluginManager("");
+ // FIXME _pluginManager = new PluginManager("");
_startup = new Exception("NAR");
}
14 years, 6 months
rhmessaging commits: r4000 - mgmt/newdata/mint/python/mint.
by rhmessaging-commits@lists.jboss.org
Author: justi9
Date: 2010-06-01 14:17:24 -0400 (Tue, 01 Jun 2010)
New Revision: 4000
Modified:
mgmt/newdata/mint/python/mint/update.py
Log:
Disable agent deletes until we can keep collectors around
Modified: mgmt/newdata/mint/python/mint/update.py
===================================================================
--- mgmt/newdata/mint/python/mint/update.py 2010-06-01 18:11:40 UTC (rev 3999)
+++ mgmt/newdata/mint/python/mint/update.py 2010-06-01 18:17:24 UTC (rev 4000)
@@ -408,6 +408,8 @@
self.agent = agent
def do_process(self, conn, stats):
+ return # XXX don't delete until we stop getting unexpected deletes
+
cursor = conn.cursor()
id = self.agent.id
14 years, 6 months
rhmessaging commits: r3999 - mgmt/newdata/cumin/model.
by rhmessaging-commits@lists.jboss.org
Author: justi9
Date: 2010-06-01 14:11:40 -0400 (Tue, 01 Jun 2010)
New Revision: 3999
Modified:
mgmt/newdata/cumin/model/condor.xml
Log:
This field isn't always set
Modified: mgmt/newdata/cumin/model/condor.xml
===================================================================
--- mgmt/newdata/cumin/model/condor.xml 2010-06-01 16:02:36 UTC (rev 3998)
+++ mgmt/newdata/cumin/model/condor.xml 2010-06-01 18:11:40 UTC (rev 3999)
@@ -492,7 +492,7 @@
<property name="Pool" type="sstr" index="y"/>
<property name="System" type="sstr" index="y"/>
- <property name="JobQueueBirthdate" type="absTime"/>
+ <property name="JobQueueBirthdate" type="absTime" optional="y"/>
<property name="MaxJobsRunning" type="uint32" desc=""/>
<property name="Machine" type="sstr" desc=""/>
<property name="MyAddress" type="sstr" desc=""/>
14 years, 6 months
rhmessaging commits: r3998 - store/trunk/cpp/lib.
by rhmessaging-commits@lists.jboss.org
Author: kpvdr
Date: 2010-06-01 12:02:36 -0400 (Tue, 01 Jun 2010)
New Revision: 3998
Modified:
store/trunk/cpp/lib/MessageStoreImpl.cpp
Log:
Fix for Bug 598557: "qpidd --no-data dir with store loaded segfaults".
Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp 2010-05-31 19:31:45 UTC (rev 3997)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2010-06-01 16:02:36 UTC (rev 3998)
@@ -361,7 +361,7 @@
void MessageStoreImpl::finalize()
{
- if (tplStorePtr->is_ready()) tplStorePtr->stop(true);
+ if (tplStorePtr.get() && tplStorePtr->is_ready()) tplStorePtr->stop(true);
{
qpid::sys::Mutex::ScopedLock sl(journalListLock);
for (JournalListMapItr i = journalList.begin(); i != journalList.end(); i++)
14 years, 6 months