Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged in fix for https://issues.apache.org/activemq/browse/AMQ-718 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0@410305 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-05-30 15:36:29 +00:00
parent fd40b91d9f
commit 5c7cf0c3c9
23 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activecluster/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
</parent> </parent>
<artifactId>activecluster</artifactId> <artifactId>activecluster</artifactId>
<name>ActiveCluster</name> <name>ActiveCluster</name>

2
activeio/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
</parent> </parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>

2
activemq-console/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
activemq-core/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

6
activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
View File

@ -234,10 +234,14 @@ final public class OpenWireFormat implements WireFormat {
size += dsm.tightMarshal1(this, c, bs); size += dsm.tightMarshal1(this, c, bs);
size += bs.marshalledSize(); size += bs.marshalledSize();
if( !sizePrefixDisabled ) {
dataOut.writeInt(size); dataOut.writeInt(size);
}
dataOut.writeByte(type); dataOut.writeByte(type);
bs.marshal(dataOut); bs.marshal(dataOut);
dsm.tightMarshal2(this, c, dataOut, bs); dsm.tightMarshal2(this, c, dataOut, bs);
} else { } else {
DataOutputStream looseOut = dataOut; DataOutputStream looseOut = dataOut;
ByteArrayOutputStream baos=null; ByteArrayOutputStream baos=null;
@ -253,7 +257,7 @@ final public class OpenWireFormat implements WireFormat {
if( !sizePrefixDisabled ) { if( !sizePrefixDisabled ) {
looseOut.close(); looseOut.close();
ByteSequence sequence = baos.toByteSequence(); ByteSequence sequence = baos.toByteSequence();
dataOut.writeInt(sequence.getLength()-4); dataOut.writeInt(sequence.getLength());
dataOut.write(sequence.getData(), sequence.getOffset(), sequence.getLength()); dataOut.write(sequence.getData(), sequence.getOffset(), sequence.getLength());
} }

2
activemq-dotnet/pom.xml
View File

@ -3,7 +3,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
activemq-gbean-management/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
activemq-gbean/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
activemq-jaas/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
activemq-jmeter/pom.xml
View File

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>activemq</groupId> <groupId>activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
</parent> </parent>
<artifactId>JMeter_sampler</artifactId> <artifactId>JMeter_sampler</artifactId>

2
activemq-optional/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
activemq-ra/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
activemq-rar/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
activemq-systest/pom.xml
View File

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
</parent> </parent>
<artifactId>activemq-systest</artifactId> <artifactId>activemq-systest</artifactId>

2
activemq-web-console/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
activemq-web-demo/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
activemq-web/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
assembly/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
etc/project.xml
View File

@ -29,7 +29,7 @@
<name>ActiveMQ</name> <name>ActiveMQ</name>
<id>activemq</id> <id>activemq</id>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<currentVersion>4.0.1-SNAPSHOT</currentVersion> <currentVersion>4.0</currentVersion>
<organization> <organization>
<name>Apache Software Foundation</name> <name>Apache Software Foundation</name>

2
maven-bundle-plugin/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
pom.xml
View File

@ -25,7 +25,7 @@
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>ActiveMQ</name> <name>ActiveMQ</name>

2
project.xml
View File

@ -22,7 +22,7 @@
<name>ActiveMQ</name> <name>ActiveMQ</name>
<id>activemq</id> <id>activemq</id>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<currentVersion>4.0.1-SNAPSHOT</currentVersion> <currentVersion>4.0</currentVersion>
<organization> <organization>
<name>Apache Software Foundation</name> <name>Apache Software Foundation</name>

2
sandbox/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-parent</artifactId> <artifactId>activemq-parent</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0</version>
</parent> </parent>
<groupId>org.apache.activemq.sandbox</groupId> <groupId>org.apache.activemq.sandbox</groupId>
<artifactId>activemq-sandbox</artifactId> <artifactId>activemq-sandbox</artifactId>