You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/11/04 12:01:43 UTC
svn commit: r1768022 - in /qpid/java/branches/6.1.x: ./
bdbstore/src/main/java/org/apache/qpid/server/
bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/
Author: orudyy
Date: Fri Nov 4 12:01:42 2016
New Revision: 1768022
URL: http://svn.apache.org/viewvc?rev=1768022&view=rev
Log:
QPID-7495: Make all BDB virtual hosts and nodes conditionally available
merged from trunk using
svn merge -c 1768017 ^/qpid/java/trunk
merge conflicts are resolved manually
Added:
qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/JECheck.java
- copied unchanged from r1768017, qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/JECheck.java
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHostImpl.java
qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImpl.java
qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeImpl.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 4 12:01:42 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767848,1767882,1767914,1768016
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767848,1767882,1767914,1768016-1768017
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java?rev=1768022&r1=1768021&r2=1768022&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java (original)
+++ qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java Fri Nov 4 12:01:42 2016
@@ -106,7 +106,7 @@ public class BDBHAReplicaVirtualHostImpl
@ManagedAttributeField
private List<NodeAutoCreationPolicy> _nodeAutoCreationPolicies;
- @ManagedObjectFactoryConstructor
+ @ManagedObjectFactoryConstructor(conditionallyAvailable = true, condition = "org.apache.qpid.server.JECheck#isAvailable()")
public BDBHAReplicaVirtualHostImpl(final Map<String, Object> attributes, VirtualHostNode<?> virtualHostNode)
{
super(parentsMap(virtualHostNode), attributes);
Modified: qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHostImpl.java?rev=1768022&r1=1768021&r2=1768022&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHostImpl.java (original)
+++ qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHostImpl.java Fri Nov 4 12:01:42 2016
@@ -54,7 +54,7 @@ public class BDBHAVirtualHostImpl extend
@ManagedAttributeField
private Long _storeOverfullSize;
- @ManagedObjectFactoryConstructor
+ @ManagedObjectFactoryConstructor(conditionallyAvailable = true, condition = "org.apache.qpid.server.JECheck#isAvailable()")
public BDBHAVirtualHostImpl(final Map<String, Object> attributes, VirtualHostNode<?> virtualHostNode)
{
super(attributes, virtualHostNode);
Modified: qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImpl.java?rev=1768022&r1=1768021&r2=1768022&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImpl.java (original)
+++ qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImpl.java Fri Nov 4 12:01:42 2016
@@ -47,7 +47,7 @@ public class BDBVirtualHostImpl extends
@ManagedAttributeField
private Long _storeOverfullSize;
- @ManagedObjectFactoryConstructor
+ @ManagedObjectFactoryConstructor(conditionallyAvailable = true, condition = "org.apache.qpid.server.JECheck#isAvailable()")
public BDBVirtualHostImpl(final Map<String, Object> attributes,
final VirtualHostNode<?> virtualHostNode)
{
Modified: qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1768022&r1=1768021&r2=1768022&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java (original)
+++ qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java Fri Nov 4 12:01:42 2016
@@ -154,7 +154,7 @@ public class BDBHAVirtualHostNodeImpl ex
private boolean _isClosed;
- @ManagedObjectFactoryConstructor
+ @ManagedObjectFactoryConstructor(conditionallyAvailable = true, condition = "org.apache.qpid.server.JECheck#isAvailable()")
public BDBHAVirtualHostNodeImpl(Map<String, Object> attributes, Broker<?> broker)
{
super(broker, attributes);
Modified: qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeImpl.java?rev=1768022&r1=1768021&r2=1768022&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeImpl.java (original)
+++ qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeImpl.java Fri Nov 4 12:01:42 2016
@@ -46,7 +46,7 @@ public class BDBVirtualHostNodeImpl exte
@ManagedAttributeField
private String _storePath;
- @ManagedObjectFactoryConstructor
+ @ManagedObjectFactoryConstructor(conditionallyAvailable = true, condition = "org.apache.qpid.server.JECheck#isAvailable()")
public BDBVirtualHostNodeImpl(Map<String, Object> attributes, Broker<?> parent)
{
super(attributes, parent);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org