You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/09/12 21:46:27 UTC
svn commit: r1760447 - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/
broker-core/src/main/java/org/apache/qpid/server/virtualhost/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/mana...
Author: rgodfrey
Date: Mon Sep 12 21:46:27 2016
New Revision: 1760447
URL: http://svn.apache.org/viewvc?rev=1760447&view=rev
Log:
QPID-7279 : Address review comments
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ExceptionHandlingFilter.java
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1760447&r1=1760446&r2=1760447&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java Mon Sep 12 21:46:27 2016
@@ -623,7 +623,7 @@ public class BDBHAVirtualHostNodeImpl ex
{
try
{
- boolean createDefaultExchanges = false;
+ boolean firstOpening = false;
closeVirtualHostIfExist().get();
getEventLogger().message(getConfigurationStoreLogSubject(), ConfigStoreMessages.RECOVERY_START());
VirtualHostStoreUpgraderAndRecoverer upgraderAndRecoverer = new VirtualHostStoreUpgraderAndRecoverer(this);
@@ -633,11 +633,12 @@ public class BDBHAVirtualHostNodeImpl ex
}
else
{
+ getConfigurationStore().upgradeStoreStructure();
ConfiguredObjectRecord[] initialRecords = getInitialRecords();
if(upgraderAndRecoverer.upgradeAndRecover(getConfigurationStore(), initialRecords))
{
setAttributes(Collections.<String, Object>singletonMap(VIRTUALHOST_INITIAL_CONFIGURATION, "{}"));
- createDefaultExchanges = initialRecords == null || initialRecords.length == 0;
+ firstOpening = initialRecords.length == 0;
}
}
@@ -669,7 +670,7 @@ public class BDBHAVirtualHostNodeImpl ex
}
final VirtualHost<?> recoveredHost = host;
- recoveredHost.setFirstOpening(createDefaultExchanges);
+ recoveredHost.setFirstOpening(firstOpening);
Subject.doAs(getSubjectWithAddedSystemRights(), new PrivilegedAction<Object>()
{
@Override
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1760447&r1=1760446&r2=1760447&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Mon Sep 12 21:46:27 2016
@@ -367,7 +367,7 @@ public abstract class AbstractVirtualHos
protected void onCreate()
{
super.onCreate();
- _createDefaultExchanges = getChildren(Exchange.class).isEmpty() && getChildren(Queue.class).isEmpty();
+ _createDefaultExchanges = true;
}
@Override
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ExceptionHandlingFilter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ExceptionHandlingFilter.java?rev=1760447&r1=1760446&r2=1760447&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ExceptionHandlingFilter.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ExceptionHandlingFilter.java Mon Sep 12 21:46:27 2016
@@ -83,7 +83,6 @@ public class ExceptionHandlingFilter imp
catch (RuntimeException e)
{
LOGGER.error("Unexpected exception in servlet '{}': ", requestURI, e);
- LOGGER.error("Stack trace: ", e);
throw e;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org