You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/12/08 04:26:50 UTC
svn commit: r888239 - in /cxf/branches/2.1.x-fixes: ./
rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties
Author: dkulp
Date: Tue Dec 8 03:26:49 2009
New Revision: 888239
URL: http://svn.apache.org/viewvc?rev=888239&view=rev
Log:
Merged revisions 888166 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................
r888166 | dkulp | 2009-12-07 17:35:47 -0500 (Mon, 07 Dec 2009) | 10 lines
Merged revisions 888165 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r888165 | dkulp | 2009-12-07 17:34:19 -0500 (Mon, 07 Dec 2009) | 2 lines
[CXF-2566] Add property for missing message
Patch from Cyrille Le Clerc applied.
........
................
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java?rev=888239&r1=888238&r2=888239&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java (original)
+++ cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java Tue Dec 8 03:26:49 2009
@@ -105,7 +105,7 @@
im.register(counter);
} catch (JMException e) {
LOG.log(Level.WARNING, "INSTRUMENTATION_REGISTER_FAULT_MSG",
- new Object[]{e});
+ new Object[]{on, e});
}
}
return counter;
Modified: cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties?rev=888239&r1=888238&r2=888239&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties (original)
+++ cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties Tue Dec 8 03:26:49 2009
@@ -22,4 +22,4 @@
CANNOT_CREATE_LOGGER_FILE = Can't create the logger file for the response time counters. {0}
CANNOT_FIND_THE_COUNTER_OBJECTNAME = Can't find the counter object name. {0}
CANNOT_FIND_STATUS = Can't find the status. {0}
-
+INSTRUMENTATION_REGISTER_FAULT_MSG=Can't register counter with object name {0}. {1}