From f50bf9cea057597e3e232e416f3a90d13f285a92 Mon Sep 17 00:00:00 2001 From: Robert Davies Date: Mon, 25 Jun 2007 11:25:21 +0000 Subject: [PATCH] apply patch http://issues.apache.org/activemq/browse/AMQ-1293 git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@550454 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/activemq/openwire/tool/CHeadersGenerator.java | 1 - .../org/apache/activemq/openwire/tool/JavaTestsGenerator.java | 2 -- .../org/apache/activemq/openwire/tool/MultiSourceGenerator.java | 2 +- .../apache/activemq/openwire/tool/SingleSourceGenerator.java | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java index 21d10c3289..de567c3c06 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java @@ -235,7 +235,6 @@ out.println("apr_status_t ow_marshall(ow_byte_buffer *buffer, ow_DataStructure * protected void generateFile(PrintWriter out) throws Exception { String structName = jclass.getSimpleName(); - String type = "OW_" + structName.toUpperCase() + "_TYPE"; out.println(""); out.println("typedef struct ow_"+structName+" {"); diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java index b33b85f13b..a32afa5d5f 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java @@ -108,8 +108,6 @@ out.println("import " + clazz.getQualifiedName() + ";"); } } - boolean marshallerAware = isMarshallAware(jclass); - out.println(""); out.println("/**"); out.println(" * Test case for the OpenWire marshalling for "+jclass.getSimpleName()+""); diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/MultiSourceGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/MultiSourceGenerator.java index e3754f1ea1..abe2dc057a 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/MultiSourceGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/MultiSourceGenerator.java @@ -146,7 +146,7 @@ public abstract class MultiSourceGenerator extends OpenWireGenerator { } public boolean isAbstractClass() { - return jclass != null & jclass.isAbstract(); + return jclass != null && jclass.isAbstract(); } public String getAbstractClassText() { diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/SingleSourceGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/SingleSourceGenerator.java index 1be3e1b2b3..ad6431ae24 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/SingleSourceGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/SingleSourceGenerator.java @@ -158,7 +158,7 @@ public abstract class SingleSourceGenerator extends OpenWireGenerator { } public boolean isAbstractClass() { - return jclass != null & jclass.isAbstract(); + return jclass != null && jclass.isAbstract(); } public String getAbstractClassText() {