Skip to content

Commit 33be27c

Browse files
author
Tim Middleton
committed
Minor
1 parent b102618 commit 33be27c

File tree

5 files changed

+17
-9
lines changed

5 files changed

+17
-9
lines changed

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,8 @@ public List<Entry<Object, Data>> getData(RequestSender requestSender, Class claz
406406
{
407407
// we received an error running the report, so mark as
408408
// a fall back so it will be immediately run
409-
LOGGER.warning(Localization.getLocalText("ERR_Failed_to_run_report", new String[] { clazz.toString(), e.toString() }));
410-
e.printStackTrace();
409+
LOGGER.warning(Localization.getLocalText("ERR_Failed_to_run_report", clazz.toString(), e.toString()));
410+
e.printStackTrace();
411411
fFallBack = true;
412412
}
413413
}

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/impl/CoherenceClusterConfigurator.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@ public static CoherenceClusterConfigurator defineApplication()
9898
return hc;
9999
}
100100

101+
/**
102+
* Checks to see if the URL is valid.
103+
*
104+
* @param sClusterName cluster name
105+
* @param sUrl uRL
106+
*
107+
* @return true if the URL is valid
108+
*/
101109
private static boolean isValid(String sClusterName, String sUrl)
102110
{
103111
if (sClusterName == null || sClusterName.equals(""))

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/AbstractData.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public SortedMap<Object, Data> getAggregatedDataUsingReport(VisualVMModel model,
146146

147147
JMXRequestSender jmxRequestSender = (JMXRequestSender) requestSender;
148148
// carry out any parameter substitution or pre-processing of reporter XML
149-
sReportXML = preProcessReporterXML(model, new StringBuffer(sReportXML).toString());
149+
sReportXML = preProcessReporterXML(model, sReportXML);
150150

151151

152152
if (m_sReporterLocation == null)
@@ -173,8 +173,8 @@ public SortedMap<Object, Data> getAggregatedDataUsingReport(VisualVMModel model,
173173
}
174174
catch (Exception e)
175175
{
176-
String sError =
177-
Localization.getLocalText("ERR_error_running_report", new String[]{sReportXML, this.getClass().getCanonicalName(), e.getMessage()});
176+
String sError = Localization.getLocalText("ERR_error_running_report",
177+
sReportXML, this.getClass().getCanonicalName(), e.getMessage());
178178

179179
LOGGER.log(Level.WARNING, sError);
180180
e.printStackTrace();
@@ -183,7 +183,7 @@ public SortedMap<Object, Data> getAggregatedDataUsingReport(VisualVMModel model,
183183

184184
// this exception is thrown so we can catch above and re-run the report
185185
// using the standard way
186-
throw new RuntimeException("Error running report");
186+
throw new RuntimeException("Error running report", e);
187187
}
188188
}
189189
return mapCollectedData;

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/ServiceData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public Data processReporterData(Object[] aoColumns, VisualVMModel model)
231231
@Override
232232
protected void preProcessReporterData(VisualVMModel model)
233233
{
234-
setDistributedCaches = new HashSet<String>();
234+
setDistributedCaches = new HashSet<>();
235235
}
236236

237237
/**

coherence-visualvm-plugin/src/main/resources/com/oracle/coherence/plugin/visualvm/Bundle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,8 @@ LBL_Coherence_Cluster=Name
512512
DESCR_CoherenceClusterProperties=Properties
513513
LBL_CoherenceClusterProperties=Properties
514514
ERR_Invalid_Cluster_Name=The provided cluster name is not valid.
515-
ERR_Invalid_URL=The provided Management URL is not valid or cannot connect to the URL "{0}".\nThe URL must be in the format of http://host:management-port/management/coherence/cluster or \
516-
http://<admin-host>:<admin-port>/management/coherence/<version>/clusters for Managed Coherence Servers. \nNote: The version number should be full 5 digits such as 12.2.1.4.0 or can also be the string "latest".
515+
ERR_Invalid_URL=The provided Management URL is not valid or cannot connect to the URL "{0}".\nThe URL must be in the format of\nhttp://<host>:<management-port>/management/coherence/cluster \nOR \n\
516+
http://<admin-host>:<admin-port>/management/coherence/<version>/clusters for Managed Coherence Servers. \nNote: The version number should be full 5 digits such as 12.2.1.4.0 or can also be the string "latest".
517517
ERR_Failed_to_run_report=The report {0} failed to run with exception {1}. Falling back from reporter.
518518

519519
# Options

0 commit comments

Comments
 (0)