You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bi...@apache.org on 2012/06/21 11:09:44 UTC
svn commit: r1352465 - in /camel/branches/camel-2.9.x: ./
components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
Author: bibryam
Date: Thu Jun 21 09:09:43 2012
New Revision: 1352465
URL: http://svn.apache.org/viewvc?rev=1352465&view=rev
Log:
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.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1352459
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java?rev=1352465&r1=1352464&r2=1352465&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java (original)
+++ camel/branches/camel-2.9.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java Thu Jun 21 09:09:43 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);
}