Author: andrew.plotnikov Date: 2012-01-27 03:57:50 -0500 (Fri, 27 Jan 2012) New Revision: 5533 Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/AbstractRPCService.java Log: EXOJCR-1725: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2 Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/AbstractRPCService.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/AbstractRPCService.java 2012-01-27 08:50:35 UTC (rev 5532) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/AbstractRPCService.java 2012-01-27 08:57:50 UTC (rev 5533) @@ -838,14 +838,19 @@ */ private static String getValueParam(InitParams params, String parameterKey) { - try + if (params != null) { - return params.getValueParam(parameterKey).getValue().trim(); + ValueParam parameterKeyValue = params.getValueParam(parameterKey); + if (parameterKeyValue != null) + { + String parameterKeyValueString = parameterKeyValue.getValue(); + if (parameterKeyValueString != null) + { + return parameterKeyValueString.trim(); + } + } } - catch (NullPointerException e) - { - return null; - } + return null; } /**