Author: chirino
Date: Tue May 30 08:36:29 2006
New Revision: 410305
URL: http://svn.apache.org/viewvc?rev=410305&view=rev
Log:
Merged in fix for https://issues.apache.org/activemq/browse/AMQ-718
Modified:
incubator/activemq/branches/activemq-4.0/activecluster/pom.xml
incubator/activemq/branches/activemq-4.0/activeio/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-console/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-core/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
incubator/activemq/branches/activemq-4.0/activemq-dotnet/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-gbean-management/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-gbean/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-jaas/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-jmeter/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-optional/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-ra/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-rar/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-systest/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-web-console/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-web-demo/pom.xml
incubator/activemq/branches/activemq-4.0/activemq-web/pom.xml
incubator/activemq/branches/activemq-4.0/assembly/pom.xml
incubator/activemq/branches/activemq-4.0/etc/project.xml
incubator/activemq/branches/activemq-4.0/maven-bundle-plugin/pom.xml
incubator/activemq/branches/activemq-4.0/pom.xml
incubator/activemq/branches/activemq-4.0/project.xml
incubator/activemq/branches/activemq-4.0/sandbox/pom.xml
Modified: incubator/activemq/branches/activemq-4.0/activecluster/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activecluster/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activecluster/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activecluster/pom.xml Tue May 30
08:36:29 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<artifactId>activecluster</artifactId>
<name>ActiveCluster</name>
Modified: incubator/activemq/branches/activemq-4.0/activeio/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activeio/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activeio/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activeio/pom.xml Tue May 30
08:36:29 2006
@@ -7,7 +7,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<groupId>incubator-activemq</groupId>
Modified: incubator/activemq/branches/activemq-4.0/activemq-console/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-console/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-console/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-console/pom.xml Tue May
30 08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/activemq-core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/pom.xml Tue May 30
08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified:
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
---
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
(original)
+++
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
Tue May 30 08:36:29 2006
@@ -233,11 +233,15 @@
BooleanStream bs = new BooleanStream();
size += dsm.tightMarshal1(this, c, bs);
size += bs.marshalledSize();
-
- dataOut.writeInt(size);
+
+ if( !sizePrefixDisabled ) {
+ dataOut.writeInt(size);
+ }
+
dataOut.writeByte(type);
bs.marshal(dataOut);
dsm.tightMarshal2(this, c, dataOut, bs);
+
} else {
DataOutputStream looseOut = dataOut;
ByteArrayOutputStream baos=null;
@@ -253,7 +257,7 @@
if( !sizePrefixDisabled ) {
looseOut.close();
ByteSequence sequence = baos.toByteSequence();
- dataOut.writeInt(sequence.getLength()-4);
+ dataOut.writeInt(sequence.getLength());
dataOut.write(sequence.getData(), sequence.getOffset(),
sequence.getLength());
}
Modified: incubator/activemq/branches/activemq-4.0/activemq-dotnet/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-dotnet/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-dotnet/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-dotnet/pom.xml Tue May 30
08:36:29 2006
@@ -3,7 +3,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
incubator/activemq/branches/activemq-4.0/activemq-gbean-management/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-gbean-management/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-gbean-management/pom.xml
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-gbean-management/pom.xml
Tue May 30 08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/activemq-gbean/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-gbean/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-gbean/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-gbean/pom.xml Tue May 30
08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/activemq-jaas/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-jaas/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-jaas/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-jaas/pom.xml Tue May 30
08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/activemq-jmeter/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-jmeter/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-jmeter/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-jmeter/pom.xml Tue May 30
08:36:29 2006
@@ -20,7 +20,7 @@
<parent>
<groupId>activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<artifactId>JMeter_sampler</artifactId>
Modified: incubator/activemq/branches/activemq-4.0/activemq-optional/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-optional/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-optional/pom.xml
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-optional/pom.xml Tue May
30 08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/activemq-ra/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-ra/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-ra/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-ra/pom.xml Tue May 30
08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/activemq-rar/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-rar/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-rar/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-rar/pom.xml Tue May 30
08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/activemq-systest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-systest/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-systest/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-systest/pom.xml Tue May
30 08:36:29 2006
@@ -20,7 +20,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<artifactId>activemq-systest</artifactId>
Modified: incubator/activemq/branches/activemq-4.0/activemq-web-console/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-web-console/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-web-console/pom.xml
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-web-console/pom.xml Tue
May 30 08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/activemq-web-demo/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-web-demo/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-web-demo/pom.xml
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-web-demo/pom.xml Tue May
30 08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/activemq-web/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-web/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-web/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-web/pom.xml Tue May 30
08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/assembly/pom.xml Tue May 30
08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/etc/project.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/etc/project.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/etc/project.xml (original)
+++ incubator/activemq/branches/activemq-4.0/etc/project.xml Tue May 30
08:36:29 2006
@@ -29,7 +29,7 @@
<name>ActiveMQ</name>
<id>activemq</id>
<groupId>incubator-activemq</groupId>
- <currentVersion>4.0.1-SNAPSHOT</currentVersion>
+ <currentVersion>4.0</currentVersion>
<organization>
<name>Apache Software Foundation</name>
Modified: incubator/activemq/branches/activemq-4.0/maven-bundle-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/maven-bundle-plugin/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/maven-bundle-plugin/pom.xml
(original)
+++ incubator/activemq/branches/activemq-4.0/maven-bundle-plugin/pom.xml Tue
May 30 08:36:29 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: incubator/activemq/branches/activemq-4.0/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/pom.xml Tue May 30 08:36:29 2006
@@ -25,7 +25,7 @@
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
<packaging>pom</packaging>
<name>ActiveMQ</name>
Modified: incubator/activemq/branches/activemq-4.0/project.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/project.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/project.xml (original)
+++ incubator/activemq/branches/activemq-4.0/project.xml Tue May 30 08:36:29
2006
@@ -22,7 +22,7 @@
<name>ActiveMQ</name>
<id>activemq</id>
<groupId>incubator-activemq</groupId>
- <currentVersion>4.0.1-SNAPSHOT</currentVersion>
+ <currentVersion>4.0</currentVersion>
<organization>
<name>Apache Software Foundation</name>
Modified: incubator/activemq/branches/activemq-4.0/sandbox/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/sandbox/pom.xml?rev=410305&r1=410304&r2=410305&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/sandbox/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/sandbox/pom.xml Tue May 30
08:36:29 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<groupId>org.apache.activemq.sandbox</groupId>
<artifactId>activemq-sandbox</artifactId>
