The CMS.getLogMessage() has been generalized to take an array of
Objects instead of Strings.

Pushed to master under trivial rule.

--
Endi S. Dewata
>From 9fa3323e017079e490a3749dfdbf5d59a08c65e9 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edew...@redhat.com>
Date: Wed, 12 Apr 2017 21:44:31 +0200
Subject: [PATCH] Updated CMS.getLogMessage().

The CMS.getLogMessage() has been generalized to take an array of
Objects instead of Strings.

Change-Id: Ifcb96d47983a67961efa27325b8ae0a88d9e0231
---
 base/common/src/com/netscape/certsrv/apps/CMS.java                  | 2 +-
 base/common/src/com/netscape/certsrv/apps/ICMSEngine.java           | 2 +-
 base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java    | 2 +-
 base/server/test/com/netscape/cmscore/app/CMSEngineDefaultStub.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base/common/src/com/netscape/certsrv/apps/CMS.java b/base/common/src/com/netscape/certsrv/apps/CMS.java
index d2210df8a47e1c7e71d647bdf794f542eae544ea..8f1d648cc6c3b8b9c804b1b82b4eb3901e0723d1 100644
--- a/base/common/src/com/netscape/certsrv/apps/CMS.java
+++ b/base/common/src/com/netscape/certsrv/apps/CMS.java
@@ -701,7 +701,7 @@ public final class CMS {
      * @param p an array of parameters
      * @return localized log message
      */
-    public static String getLogMessage(String msgID, String p[]) {
+    public static String getLogMessage(String msgID, Object p[]) {
         return _engine.getLogMessage(msgID, p);
     }
 
diff --git a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
index 97fc4679eccef3d27dff01402e72625bb38a0fea..3655b0389a3dc7f8c9d232ba23b630511f1f32ed 100644
--- a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
+++ b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
@@ -334,7 +334,7 @@ public interface ICMSEngine extends ISubsystem {
      * @param p an array of parameters
      * @return localized log message
      */
-    public String getLogMessage(String msgID, String p[]);
+    public String getLogMessage(String msgID, Object p[]);
 
     /**
      * Retrieves the centralized log message from LogMessages.properties.
diff --git a/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
index 90ee8b90a4841ee79970c9b857b95468d7ecd2ec..ef9a6a28a8430560652e4c19dc8b96971187e1ec 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
@@ -1583,7 +1583,7 @@ public class CMSEngine implements ICMSEngine {
         return getUserMessage(locale, msgID, params);
     }
 
-    public String getLogMessage(String msgID, String params[]) {
+    public String getLogMessage(String msgID, Object params[]) {
         ResourceBundle rb = ResourceBundle.getBundle(
                 "LogMessages");
         String msg = rb.getString(msgID);
diff --git a/base/server/test/com/netscape/cmscore/app/CMSEngineDefaultStub.java b/base/server/test/com/netscape/cmscore/app/CMSEngineDefaultStub.java
index d6305cbb9aa85df89b7ff1bb9de49ded48364d98..dd28adb56892643b6b94880b5ab4b7e1e9820636 100644
--- a/base/server/test/com/netscape/cmscore/app/CMSEngineDefaultStub.java
+++ b/base/server/test/com/netscape/cmscore/app/CMSEngineDefaultStub.java
@@ -211,7 +211,7 @@ public class CMSEngineDefaultStub implements ICMSEngine {
         return null;
     }
 
-    public String getLogMessage(String msgID, String p[]) {
+    public String getLogMessage(String msgID, Object p[]) {
         return null;
     }
 
-- 
2.9.3

_______________________________________________
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel

Reply via email to