diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2011-07-20 20:46:49 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2011-07-20 20:46:49 +0000 |
| commit | 66e1048af0c740632764a6ce8004a773eeb01f42 (patch) | |
| tree | 5758b423a1f3506c7aa5e3edb38f41cfe8f7cd5a /qpid/java/client | |
| parent | 33f28e9d4714b52013effed1b2f231893a752f16 (diff) | |
| download | qpid-python-66e1048af0c740632764a6ce8004a773eeb01f42.tar.gz | |
Merge branch 'perf' into trunk
Conflicts:
qpid/java/tools/bin/perf-report
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1148935 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java index 58f108f1a4..7f735e0722 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java @@ -110,7 +110,7 @@ public class AMQPEncodedMapMessage extends JMSMapMessage } // for testing - Map<String,Object> getMap() + public Map<String,Object> getMap() { return _map; } |