From e932f23af2b0b5d6b85a8e57eeb54085644411d2 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Wed, 26 Jan 2011 13:58:10 -0800
Subject: [PATCH] Catch and ignore exceptions caused by external program, let
 console proxy at least continue and give possibility for administrator to
 manually correct the route issue inside console proxy VM

---
 .../agent/resource/consoleproxy/ConsoleProxyResource.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
index efe6ea3861f..9f645f8f479 100644
--- a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
+++ b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
@@ -442,7 +442,11 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
 			
 			// this method won't be called in high frequency, serialize access to script execution
 			synchronized(this) {
-				addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, address);
+			    try {
+			        addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, address);
+			    } catch(Throwable e) {
+			        s_logger.warn("Unexpected exception while adding internal route to " + address, e);
+			    }
 			}
     	}
     }