summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2010-03-04 11:19:46 +0000
committerRobert Gemmell <robbie@apache.org>2010-03-04 11:19:46 +0000
commit9e29f07bbb18a4892ae1a4141df907932877cabf (patch)
treec0208c48a6b3466c56b62172316688094c028784
parent7374b4a58d4bb37ca384627696dce9124ad79eeb (diff)
downloadqpid-python-9e29f07bbb18a4892ae1a4141df907932877cabf.tar.gz
QPID-2379: defer getShadow property to ConnectionConfig objects instead of hardcoding in the delegate
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@918944 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java4
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java2
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java5
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java5
-rwxr-xr-xqpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java5
5 files changed, 18 insertions, 3 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
index 8a59178b77..6d360b2084 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
@@ -1230,11 +1230,9 @@ public class QMFService implements ConfigStore.ConfigEventListener
return _obj.getCreateTime();
}
- @Override
public Boolean getShadow()
{
- // TODO Auto-generated method stub
- return false;
+ return _obj.isShadow();
}
}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java
index 95fb7d39a1..ad451f44a7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java
@@ -42,4 +42,6 @@ public interface ConnectionConfig extends ConfiguredObject<ConnectionConfigType,
Integer getRemoteParentPID();
ConfigStore getConfigStore();
+
+ Boolean isShadow();
} \ No newline at end of file
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
index dc7f2654e6..ba305c96fa 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
@@ -183,6 +183,11 @@ public class BrokerLink implements LinkConfig, ConnectionListener
{
return _adapterCreateTime;
}
+
+ public Boolean isShadow()
+ {
+ return false;
+ }
}
private class SessionFactory implements Connection.SessionFactory
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
index 3ee4d5529e..e2735d151b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
@@ -1139,4 +1139,9 @@ public class AMQProtocolEngine implements ProtocolEngine, Managable, AMQProtocol
return _createTime;
}
+ public Boolean isShadow()
+ {
+ return false;
+ }
+
}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
index 89ba665e72..56784e7251 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
@@ -183,4 +183,9 @@ public class ProtocolEngine_0_10 extends InputHandler implements ProtocolEngine
{
return _createTime;
}
+
+ public Boolean isShadow()
+ {
+ return false;
+ }
}