svn commit: r1467890 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java

[ningjiang]

Author: ningjiang
Date: Mon Apr 15 07:58:29 2013
New Revision: 1467890

URL: http://svn.apache.org/r1467890
Log:
CAMEL-6262 clean up the code
Merged revisions 1467886 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x

................
  r1467886 | ningjiang | 2013-04-15 15:46:00 +0800 (Mon, 15 Apr 2013) | 10 lines
  
  Merged revisions 1467880 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1467880 | ningjiang | 2013-04-15 15:30:56 +0800 (Mon, 15 Apr 2013) | 1 line
    
    CAMEL-6262 clean up the code
  ........
................

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1467880
  Merged /camel/branches/camel-2.10.x:r1467886

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java?rev=1467890&r1=1467889&r2=1467890&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
 Mon Apr 15 07:58:29 2013
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.support;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -24,7 +23,6 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.StatefulService;
 import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -289,7 +287,7 @@ public abstract class ServiceSupport imp
             // ignore
         } finally {
             if (is != null) {
-                IOHelper.close(is, null, null);
+                IOHelper.close(is);
             }
         }