Applied. Thanks. --Sheng
On Mon, Jun 18, 2012 at 5:54 PM, Vijayendra Bhamidipati <[email protected]> wrote: > Hi Team, > > Please find attached the ASF master git patch for Bug CS-15241 > (http://bugs.cloudstack.org/browse/CS-15241 ). Also, pasting the contents of > the patch below for quicker review. > > Please note that this is not the fix for the bug's root cause but a fix for > one of the issues found during investigation of the bug. > > Regards, > Vijay > > > From b63e7d31a7e9372f0de5ada01cdf2396ef2daacb Mon Sep 17 00:00:00 2001 > From: Vijayendra Bhamidipati <[email protected]> > Date: Mon, 18 Jun 2012 17:50:07 -0700 > Subject: [PATCH] CS-15241: static NAT is not working when provider is set to > Juniper SRX > > Description: > > Checking in fix for the exception seen due to the absence of > the AsyncCommandQueued exception in the map of CSExceptionErrorCode > which is used to look up the error code corresponding to a > cloudstack exception. Also printing the stack trace in case > an exception is not found in the map. > --- > .../utils/exception/CSExceptionErrorCode.java | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java > b/utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java > index 03565bb..74e42a6 100755 > --- a/utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java > +++ b/utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java > @@ -92,13 +92,15 @@ public class CSExceptionErrorCode { > > ExceptionErrorCodeMap.put("com.cloud.exception.ResourceUnavailableException", > 4520); > > ExceptionErrorCodeMap.put("com.cloud.exception.StorageUnavailableException", > 4525); > > ExceptionErrorCodeMap.put("com.cloud.exception.UnsupportedServiceException", > 4530); > - > ExceptionErrorCodeMap.put("com.cloud.exception.VirtualMachineMigrationException", > 4535); > + > ExceptionErrorCodeMap.put("com.cloud.exception.VirtualMachineMigrationException", > 4535); > + > ExceptionErrorCodeMap.put("com.cloud.async.AsyncCommandQueued", 4540); > > // Have a special error code for ServerApiException > when it is > // thrown in a standalone manner when failing to > detect any of the above > // standard exceptions. > > ExceptionErrorCodeMap.put("com.cloud.api.ServerApiException", 9999); > } catch (Exception e) { > + e.printStackTrace(); > throw new ExceptionInInitializerError(e); > } > } > -- > 1.7.5.1
