svn commit: r1352484 - in /camel/branches/camel-2.8.x: ./ components/camel-guice/src/main/java/org/apache/camel/guice/Main.java

[bibryam]

Author: bibryam
Date: Thu Jun 21 10:06:52 2012
New Revision: 1352484

URL: http://svn.apache.org/viewvc?rev=1352484&view=rev
Log:
Merged revisions 1352465 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x

................
  r1352465 | bibryam | 2012-06-21 10:09:43 +0100 (Thu, 21 Jun 2012) | 9 lines
  
  Merged revisions 1352459 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1352459 | bibryam | 2012-06-21 09:50:25 +0100 (Thu, 21 Jun 2012) | 1 line
    
    enableHangupSupport  for camel-guice Main
  ........
................

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1352459
  Merged /camel/branches/camel-2.9.x:r1352465

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

Modified: 
camel/branches/camel-2.8.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java?rev=1352484&r1=1352483&r2=1352484&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
 Thu Jun 21 10:06:52 2012
@@ -73,6 +73,7 @@ public class Main extends MainSupport {
     public static void main(String... args) throws Exception {
         Main main = new Main();
         instance = main;
+        main.enableHangupSupport();
         main.run(args);
     }