Author: ningjiang
Date: Sun Jun 8 21:35:56 2008
New Revision: 664624
URL: http://svn.apache.org/viewvc?rev=664624&view=rev
Log:
CAMEL-591 CAMEL-592 CAMEL-593 patches applied with huge thanks to Dave
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=664624&r1=664623&r2=664624&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Sun Jun 8 21:35:56 2008
@@ -133,7 +133,6 @@
protected MethodInfo introspect(Class clazz, Method method) {
Class[] parameterTypes = method.getParameterTypes();
Annotation[][] parametersAnnotations =
method.getParameterAnnotations();
- final Expression[] parameterExpressions = new
Expression[parameterTypes.length];
List<ParameterInfo> parameters = new ArrayList<ParameterInfo>();
List<ParameterInfo> bodyParameters = new ArrayList<ParameterInfo>();
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=664624&r1=664623&r2=664624&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
Sun Jun 8 21:35:56 2008
@@ -97,10 +97,12 @@
return new FileExchange(getCamelContext(), getExchangePattern(), file);
}
+ @Override
public FileExchange createExchange() {
return createExchange(getFile());
}
+ @Override
public FileExchange createExchange(ExchangePattern pattern) {
return new FileExchange(getCamelContext(), pattern, file);
}
@@ -285,7 +287,7 @@
* A strategy method to lazily create the file strategy
*/
protected FileProcessStrategy createFileStrategy() {
- Class factory = null;
+ Class<?> factory = null;
try {
FactoryFinder finder = new
FactoryFinder("META-INF/services/org/apache/camel/component/");
factory = finder.findClass("file", "strategy.factory.");
@@ -315,16 +317,16 @@
protected Properties getParamsAsProperties() {
Properties params = new Properties();
if (isNoop()) {
- params.setProperty("noop", Boolean.toString(Boolean.TRUE));
+ params.setProperty("noop", Boolean.toString(true));
}
if (isDelete()) {
- params.setProperty("delete", Boolean.toString(Boolean.TRUE));
+ params.setProperty("delete", Boolean.toString(true));
}
if (isAppend()) {
- params.setProperty("append", Boolean.toString(Boolean.TRUE));
+ params.setProperty("append", Boolean.toString(true));
}
if (isLock()) {
- params.setProperty("lock", Boolean.toString(Boolean.TRUE));
+ params.setProperty("lock", Boolean.toString(true));
}
if (moveNamePrefix != null) {
params.setProperty("moveNamePrefix", moveNamePrefix);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java?rev=664624&r1=664623&r2=664624&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
Sun Jun 8 21:35:56 2008
@@ -24,6 +24,8 @@
import java.nio.ByteBuffer;
import org.apache.camel.Converter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Some core java.nio based
@@ -33,6 +35,7 @@
*/
@Converter
public final class NIOConverter {
+ private static final transient Log LOG =
LogFactory.getLog(NIOConverter.class);
/**
* Utility classes should not have a public constructor.
@@ -57,10 +60,20 @@
@Converter
public static ByteBuffer toByteBuffer(File file) throws IOException {
- byte[] buf = new byte[(int)file.length()];
- InputStream in = new BufferedInputStream(new FileInputStream(file));
- in.read(buf);
- return ByteBuffer.wrap(buf);
+ InputStream in = null;
+ try {
+ byte[] buf = new byte[(int)file.length()];
+ in = new BufferedInputStream(new FileInputStream(file));
+ in.read(buf);
+ return ByteBuffer.wrap(buf);
+ } finally {
+ try {
+ if (in != null)
+ in.close();
+ } catch (IOException e) {
+ LOG.warn("Failed to close file stream: " + file.getPath(), e);
+ }
+ }
}
@Converter
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java?rev=664624&r1=664623&r2=664624&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
Sun Jun 8 21:35:56 2008
@@ -84,9 +84,9 @@
@Converter
public static Boolean toBoolean(Boolean value) {
if (value != null) {
- return value.booleanValue();
+ return value;
}
- return false;
+ return Boolean.FALSE;
}
@@ -99,9 +99,9 @@
return (Byte) value;
} else if (value instanceof Number) {
Number number = (Number) value;
- return number.byteValue();
+ return Byte.valueOf(number.byteValue());
} else if (value instanceof String) {
- return Byte.parseByte((String) value);
+ return Byte.valueOf((String) value);
} else {
return null;
}
@@ -131,9 +131,9 @@
return (Short) value;
} else if (value instanceof Number) {
Number number = (Number) value;
- return number.shortValue();
+ return Short.valueOf(number.shortValue());
} else if (value instanceof String) {
- return Short.parseShort((String) value);
+ return Short.valueOf((String) value);
} else {
return null;
}
@@ -148,9 +148,9 @@
return (Integer) value;
} else if (value instanceof Number) {
Number number = (Number) value;
- return number.intValue();
+ return Integer.valueOf(number.intValue());
} else if (value instanceof String) {
- return Integer.parseInt((String) value);
+ return Integer.valueOf((String) value);
} else {
return null;
}
@@ -165,9 +165,9 @@
return (Long) value;
} else if (value instanceof Number) {
Number number = (Number) value;
- return number.longValue();
+ return Long.valueOf(number.longValue());
} else if (value instanceof String) {
- return Long.parseLong((String) value);
+ return Long.valueOf((String) value);
} else {
return null;
}
@@ -182,9 +182,9 @@
return (Float) value;
} else if (value instanceof Number) {
Number number = (Number) value;
- return number.floatValue();
+ return Float.valueOf(number.floatValue());
} else if (value instanceof String) {
- return Float.parseFloat((String) value);
+ return Float.valueOf((String) value);
} else {
return null;
}
@@ -199,9 +199,9 @@
return (Double) value;
} else if (value instanceof Number) {
Number number = (Number) value;
- return number.doubleValue();
+ return Double.valueOf(number.doubleValue());
} else if (value instanceof String) {
- return Double.parseDouble((String) value);
+ return Double.valueOf((String) value);
} else {
return null;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java?rev=664624&r1=664623&r2=664624&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
Sun Jun 8 21:35:56 2008
@@ -146,7 +146,6 @@
*/
public ObjectName getObjectName(RouteContext routeContext,
ProcessorType processor) throws MalformedObjectNameException {
- RouteType route = routeContext.getRoute();
Endpoint<? extends Exchange> ep = routeContext.getEndpoint();
String ctxid = ep != null ? getContextId(ep.getCamelContext()) :
VALUE_UNKNOWN;
String cid = getComponentId(ep);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java?rev=664624&r1=664623&r2=664624&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
Sun Jun 8 21:35:56 2008
@@ -94,12 +94,12 @@
}
public RedeliveryPolicyType useCollisionAvoidance() {
- setUseCollisionAvoidance(true);
+ setUseCollisionAvoidance(Boolean.TRUE);
return this;
}
public RedeliveryPolicyType useExponentialBackOff() {
- setUseExponentialBackOff(true);
+ setUseExponentialBackOff(Boolean.TRUE);
return this;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=664624&r1=664623&r2=664624&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
Sun Jun 8 21:35:56 2008
@@ -250,7 +250,7 @@
next = counter + 1;
}
in.setHeader(REDELIVERY_COUNTER, next);
- in.setHeader(REDELIVERED, true);
+ in.setHeader(REDELIVERED, Boolean.TRUE);
exchange.setException(e);
return next;
}
@@ -270,10 +270,12 @@
}
}
+ @Override
protected void doStart() throws Exception {
ServiceHelper.startServices(output, deadLetter);
}
+ @Override
protected void doStop() throws Exception {
ServiceHelper.stopServices(deadLetter, output);
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java?rev=664624&r1=664623&r2=664624&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
Sun Jun 8 21:35:56 2008
@@ -59,7 +59,7 @@
}
value = buffer.toString();
}
- Double number = Double.parseDouble(value);
+ double number = Double.parseDouble(value);
return number >= minimumVersion;
}
} catch (Exception e) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java?rev=664624&r1=664623&r2=664624&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
Sun Jun 8 21:35:56 2008
@@ -350,9 +350,10 @@
*/
private void loadImplementationsInJar(Test test, String parent, File
jarfile) {
+ JarInputStream jarStream = null;
try {
JarEntry entry;
- JarInputStream jarStream = new JarInputStream(new
FileInputStream(jarfile));
+ jarStream = new JarInputStream(new FileInputStream(jarfile));
while ((entry = jarStream.getNextJarEntry()) != null) {
String name = entry.getName();
@@ -366,6 +367,14 @@
} catch (IOException ioe) {
LOG.error("Could not search jar file '" + jarfile + "' for classes
matching criteria: " + test
+ "due to an IOException: " + ioe.getMessage());
+ } finally {
+ try {
+ if (jarStream != null)
+ jarStream.close();
+ } catch (IOException e) {
+ LOG.warn("Failed to close jar stream: " + jarfile.getPath(),
e);
+ }
+
}
}
