Chronological Thread 

< Chronological >      < Thread >

---

Author: nordunet.behrmann
Date: 2012-12-08 15:12:47 +0000 (Sat, 08 Dec 2012)
New Revision: 6062

Modified:

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
trunk/perfsonar-java-sql-ma/src/main/resources/i18n.properties

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/servlet.properties

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/nmwg/owamp/Parameters.java
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCMDSTest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSListAddresses.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/XmlDbDataRepository.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHTTPAccess.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlDataRepository.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlDataRepository.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandler.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandlerAxis2.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/L2PathStatusKeyGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
Log:
perfsonar_base, perfsonar-java-sql-ma: Fixed issues identified by static
analysis

Found by IntelliJ.

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -710,7 +710,7 @@
String serviceName = null;
try {
serviceName = configuration.getProperty("service.name");
- } catch (Exception ex) {
+ } catch (PerfSONARException ignored) {
}
if (serviceName == null) {
serviceName = "pS" + serviceType;
@@ -754,7 +754,7 @@
String serviceName = null;
try {
serviceName = configuration.getProperty("service.name");
- } catch (Exception ex) {
+ } catch (PerfSONARException ignored) {
}
if (serviceName == null) {
serviceName = "pS" + serviceType;

Modified: trunk/perfsonar-java-sql-ma/src/main/resources/i18n.properties
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/resources/i18n.properties
2012-12-07 21:12:27 UTC (rev 6061)
+++ trunk/perfsonar-java-sql-ma/src/main/resources/i18n.properties
2012-12-08 15:12:47 UTC (rev 6062)
@@ -27,7 +27,7 @@
# List
serviceList=List
serviceListURL=servlet/AxisServlet
-serviceListFootnote=View the list of deployed Web services
+serviceListFootnote=View the list of deployed Web services

# Call
callAnEndpoint=Call
@@ -46,12 +46,12 @@
adminFootnote=[disabled by default for security reasons]

# SOAPMonitor
-soapMonitor=SOAPMonitor
+soapMonitor=SOAPMonitor
soapMonitorURL=SOAPMonitor
soapMonitorFootnote=[disabled by default for security reasons]

# Sidenote
-sideNote=To enable the disabled features, uncomment the appropriate
declarations in WEB-INF/web.xml in the webapplication and restart it.
+sideNote=To enable the disabled features, uncomment the appropriate
declarations in WEB-INF/web.xml in the webapplication and restart it.

### Validating Axis ###
#
@@ -63,7 +63,7 @@
validationNote00=If the "happyaxis" validation page displays an exception
instead of a status page, the likely cause is that you have multiple XML
parsers in your classpath. Clean up your classpath by eliminating extraneous
parsers.

# Note 1
-validationNote01=If you have problems getting Axis to work, consult the Axis
<a href="http://wiki.apache.org/ws/FrontPage/Axis";>Wiki</a> and then try the
Axis user mailing list.
+validationNote01=If you have problems getting Axis to work, consult the Axis
<a href="http://wiki.apache.org/ws/FrontPage/Axis";>Wiki</a> and then try the
Axis user mailing list.

#
#################### [index.jsp] ###########################

Modified:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/servlet.properties
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/servlet.properties
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/servlet.properties
2012-12-08 15:12:47 UTC (rev 6062)
@@ -2,7 +2,7 @@
servlet.service_type=sqlma

#The ConfigurationHandler interface implementation used by the Wizard Servlet
-servlet.wizard.external_handler=perfSONARWebAdmin.admin.wizard.services.RRDMAHandler

+servlet.wizard.external_handler=perfSONARWebAdmin.admin.wizard.services.RRDMAHandler

#The username used for authentication reasons when accessing properties
configuration and Wizard servlets
servlet.username=perfsonaruser

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -445,27 +445,23 @@
+ " class cannot be found. The event
type "
+ "associated with this class is:" +
eventTypeString + " The"
+ " error message seen is" +
e1.getMessage());
- continue;
} catch (InstantiationException e) {
logger.error("Scheduler: The configured SchedulerAction"
+ " class cannot be instantiated. The
event type "
+ "associated with this class is:" +
eventTypeString + " The"
+ " error message seen is" +
e.getMessage());
- continue;
} catch (IllegalAccessException e) {
logger.error("Scheduler: The configured SchedulerAction"
+ " class cannot be instantiated
because of illegal"
+ "Access. The event type associated
with this "
+ "class is:" + eventTypeString + " The
error message seen is"
+ e.getMessage());
- continue;
} catch (Exception e) {
logger.error("Scheduler: The configured SchedulerAction"
+ " class cannot be invoked because of
unknown"
+ "exception. The event type associated
with this "
+ "class is:" + eventTypeString + " The
error message seen is"
+ e.getMessage());
- continue;
}
} else {
// use the generic schedulerAction

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/nmwg/owamp/Parameters.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/nmwg/owamp/Parameters.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/nmwg/owamp/Parameters.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -96,12 +96,10 @@
System.err.println("Error: " + getFileName()
+ " 'addParameter(Parameter)'
Unrecognized "
+ " parameter: " +
newParameter.getParameterName() + ".");
- return;
}
} else {
System.err.println("Error: " + getFileName()
+ " 'addParameter(Paramter)' Parameter
cannont be nil.");
- return;
}
}

@@ -128,13 +126,11 @@
System.err.println("Error: " + getFileName()
+ " 'addParameter(String, String)'
Unrecognized "
+ " parameter: " + name + ".");
- return;
}
} else {
System.err.println("Error: " + getFileName()
+ " 'addParameter(String, String)' cannot
have nil value"
+ " for name or value.");
- return;
}
}
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java
===================================================================
--- trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java
2012-12-07 21:12:27 UTC (rev 6061)
+++ trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -370,27 +370,21 @@
String str,
String attribute)
{
- try { //just in case of a RuntimeException
+ int ind1 = str.indexOf(attribute);

- int ind1 = str.indexOf(attribute);
+ if (ind1 > -1) {
+ ind1 = str.indexOf('\"', ind1);
+ } else {
+ return null; //attribute not found
+ }

- if (ind1 > -1) {
- ind1 = str.indexOf('\"', ind1);
- } else {
- return null; //attribute not found
+ if (ind1 > -1) {
+ ind1 += 1;
+ int ind2 = str.indexOf('\"', ind1);
+ if (ind2 > -1) {
+ return str.substring(ind1, ind2); //return value of attribute
}
-
- if (ind1 > -1) {
- ind1 += 1;
- int ind2 = str.indexOf('\"', ind1);
- if (ind2 > -1) {
- return str.substring(ind1, ind2); //return value of
attribute
- }
- }
-
- } catch (Exception ex) {
}
-
return null; //bad xml?
}


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCMDSTest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCMDSTest.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCMDSTest.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -11,30 +11,28 @@
public class UbCMDSTest
{

- public void testMDS(String[] args)
+ public void testMDS(String[] args) throws PerfSONARException
{
- try {
- String defaultMDS = "http://mds.rediris.es:8080";;
- if (args.length == 1) {
- defaultMDS = args[0];
+ String defaultMDS = "http://mds.rediris.es:8080";;
+ if (args.length == 1) {
+ defaultMDS = args[0];
+ }
+ List<BEMetaData> bes =
EduGAINMetadataService.getOrganizationList(defaultMDS,
"/tmp/eduGAINtruststore.jks",
+
"12345678", "/tmp/ValidComponentsFile");
+ for (BEMetaData be : bes) {
+ System.out.println("Bridging Element " + be.getComponentID());
+ CAInterface caonline = be.getCAInterface();
+ if (caonline != null) {
+ System.out.println("*** CA online: " +
caonline.getContactURL());
}
- List<BEMetaData> bes =
EduGAINMetadataService.getOrganizationList(defaultMDS,
"/tmp/eduGAINtruststore.jks",
-
"12345678", "/tmp/ValidComponentsFile");
- for (BEMetaData be : bes) {
- System.out.println("Bridging Element " +
be.getComponentID());
- CAInterface caonline = be.getCAInterface();
- if (caonline != null) {
- System.out.println("*** CA online: " +
caonline.getContactURL());
- }
- }
- } catch (PerfSONARException e) {
}
+
}

/**
* @param args
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws PerfSONARException
{
UbCMDSTest mdsTest = new UbCMDSTest();
mdsTest.testMDS(args);

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -126,7 +126,7 @@
}
}
} catch (XPathExpressionException e) {
-
+ throw com.google.common.base.Throwables.propagate(e);
}
}


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSListAddresses.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSListAddresses.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSListAddresses.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -26,15 +26,12 @@
*/
public void addFromString(Collection<String> urls, String multiUrlString)
{
- try {
- String[] u = multiUrlString.split(",");
- for (String urlString : u) {
- String s = urlString.trim();
- if (!s.isEmpty()) {
- urls.add(s);
- }
+ String[] u = multiUrlString.split(",");
+ for (String urlString : u) {
+ String s = urlString.trim();
+ if (!s.isEmpty()) {
+ urls.add(s);
}
- } catch (RuntimeException ex) {
}
}

@@ -44,22 +41,17 @@
*
* @param urls
* @param multiUrlString
- * @throws MalformedURLException
- * @throws IOException
*/
public void addFromMultipleURLs(Collection<String> urls, String
multiUrlString)
{
- try {
- String[] u = multiUrlString.split(",");
- for (String urlString : u) {
- String s = urlString.trim();
- if (!s.isEmpty()) {
- try {
- addFromURL(urls, s);
- } catch (Exception ex) { /* just omit */ }
- }
+ String[] u = multiUrlString.split(",");
+ for (String urlString : u) {
+ String s = urlString.trim();
+ if (!s.isEmpty()) {
+ try {
+ addFromURL(urls, s);
+ } catch (IOException ignored) { /* just omit */ }
}
- } catch (RuntimeException rex) {
}
}

@@ -68,7 +60,6 @@
*
* @param urls
* @param urlString
- * @throws MalformedURLException
* @throws IOException
*/
public void addFromURL(Collection<String> urls, String urlString) throws
IOException
@@ -78,16 +69,17 @@
BufferedReader in = new BufferedReader(
new InputStreamReader(
rhc.getInputStream()));
- String line;
- while ((line = in.readLine()) != null) {
- try {
+ try {
+ String line;
+ while ((line = in.readLine()) != null) {
String s = line.trim();
if (!s.isEmpty()) {
System.out.println(line);
urls.add(line);
}
- } catch (RuntimeException rex) { /* just omit this line */ }
+ }
+ } finally {
+ in.close();
}
- in.close();
}
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -240,7 +240,7 @@
}


- private ServiceContent getLSSummaryContent()
+ private ServiceContent getLSSummaryContent() throws PerfSONARException
{

return new LSSummaryServiceContent();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -57,21 +57,12 @@

// ----------------------------------------------------------------------

- public LSSummaryServiceContent()
+ public LSSummaryServiceContent() throws PerfSONARException
{
-
- try {
- this.logger = (LoggerComponent) AuxiliaryComponentManager
- .getInstance().getComponent(ComponentNames.LOGGER);
- } catch (PerfSONARException e) {
- }
-
- try {
- this.config = (ConfigurationComponent) AuxiliaryComponentManager
- .getInstance().getComponent(ComponentNames.CONFIG);
- } catch (PerfSONARException e) {
- }
-
+ this.logger = (LoggerComponent) AuxiliaryComponentManager
+ .getInstance().getComponent(ComponentNames.LOGGER);
+ this.config = (ConfigurationComponent) AuxiliaryComponentManager
+ .getInstance().getComponent(ComponentNames.CONFIG);
}

/**
@@ -119,7 +110,7 @@
synchronized (this) {
try {
Thread.sleep(60000);
- } catch (InterruptedException e) {
+ } catch (InterruptedException ignored) {

}
}
@@ -328,15 +319,15 @@
logger.debug("LSSummaryServiceContent.getAllServicesSummaries: got
summary from database. Number of: ");
try {
logger.debug(" - IP: [" + ipResults.length + "]");
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
logger.debug(" - domains: [" + domainResults.length +
"]");
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
logger.debug(" - eventvTypes: [" +
eventTypeResults.length + "]");
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}

populateSummary(summaries, ipResults, IP);

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/XmlDbDataRepository.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/XmlDbDataRepository.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/XmlDbDataRepository.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -46,17 +46,11 @@
// ----------------------------------- Constructor --------------------


- protected XmlDbDataRepository()
+ protected XmlDbDataRepository() throws PerfSONARException
{
-
- try {
- logger = (LoggerComponent) AuxiliaryComponentManager.
- getInstance().getComponent(ComponentNames.LOGGER);
- } catch (PerfSONARException e) {
- }
-
+ logger = (LoggerComponent) AuxiliaryComponentManager.
+ getInstance().getComponent(ComponentNames.LOGGER);
logger.debug("XmlDbDataRepository: created");
-
}



Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHTTPAccess.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHTTPAccess.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHTTPAccess.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -168,19 +168,19 @@
hits = Integer.parseInt(
XMLUtils.extractXMLAttributeValue(
str, "exist:hits"));
- } catch (RuntimeException e) {
+ } catch (RuntimeException ignored) {
}
try {
count = Integer.parseInt(
XMLUtils.extractXMLAttributeValue(
str, "exist:count"));
- } catch (RuntimeException e) {
+ } catch (RuntimeException ignored) {
}
try {
first = Integer.parseInt(
XMLUtils.extractXMLAttributeValue(
str, "exist:start"));
- } catch (RuntimeException e) {
+ } catch (RuntimeException ignored) {
}

if (debug) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlDataRepository.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlDataRepository.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlDataRepository.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -19,7 +19,7 @@
}


- public ExistDbHttpXmlDataRepository(String uri, String username, String
password)
+ public ExistDbHttpXmlDataRepository(String uri, String username, String
password) throws PerfSONARException
{

super();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlDataRepository.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlDataRepository.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlDataRepository.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -48,35 +48,29 @@
//
-----------------------------------------------------------------------
Constructor


- public ExistDbXmlrpcXmlDataRepository(String driverClassname, String
uri, String username, String password)
+ public ExistDbXmlrpcXmlDataRepository(String driverClassname, String
uri, String username, String password) throws PerfSONARException
{
-
this();
setDbDriverClassname(driverClassname);
setDbPassword(password);
setDbUsername(username);
setDbUri(uri);
-
}

-
- public ExistDbXmlrpcXmlDataRepository(String uri, String username,
String password)
+ public ExistDbXmlrpcXmlDataRepository(String uri, String username,
String password) throws PerfSONARException
{
-
this();
setDbPassword(password);
setDbUsername(username);
setDbUri(uri);
-
}

-
- public ExistDbXmlrpcXmlDataRepository()
+ public ExistDbXmlrpcXmlDataRepository() throws PerfSONARException
{
+ super();
// nothing to do here, all parameters are default
}

-
// --------------------------------------------------------------------
Public methods-



Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandler.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandler.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandler.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -315,6 +315,6 @@
{
long time = System.currentTimeMillis() - startTime;
logger.info(String.format("Execution Time of message type=[%s]
id=[%s] is [%3$tM]min [%3$tS]secs "
- + "[%3$tL]milisec", messageType,
messageId, Long.valueOf(time)));
+ + "[%3$tL]milisec", messageType,
messageId, time));
}
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandlerAxis2.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandlerAxis2.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandlerAxis2.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -260,6 +260,6 @@
{
long time = System.currentTimeMillis() - startTime;
logger.info(String.format("Execution Time of message type=[%s]
id=[%s] is [%3$tM]min [%3$tS]secs "
- + "[%3$tL]milisec", messageType,
messageId, Long.valueOf(time)));
+ + "[%3$tL]milisec", messageType,
messageId, time));
}
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -415,7 +415,7 @@
try {
xmldbAccess =
configuration.getProperty("component.ma.xmldb.db_access");
- } catch (Exception ex) {
+ } catch (PerfSONARException ignored) {
}

if (xmldbAccess == null || xmldbAccess.isEmpty()) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/L2PathStatusKeyGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/L2PathStatusKeyGenerator.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/L2PathStatusKeyGenerator.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -45,7 +45,7 @@
try {
ibatisServiceConfigParameter =

getConfiguration().getProperty("service.ma.sql.default_ibatis_config");
- } catch (Exception ex) {
+ } catch (PerfSONARException ignored) {
}

if (!ibatisServiceConfigParameter.trim().isEmpty()) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -165,7 +165,7 @@
String linkGlobalName = "";
try {
linkGlobalName =
link.getGlobalNameElement().getGlobalName().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}


@@ -244,19 +244,19 @@

try {
node1Name =
nodeArray[0].getNameElement().getName().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node1Country =
nodeArray[0].getCountryElement().getCountry().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node1City =
nodeArray[0].getCityElement().getCity().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node1Institution =
nodeArray[0].getInstitutionElement().getInstitution().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}


@@ -267,19 +267,19 @@

try {
node2Name =
nodeArray[1].getNameElement().getName().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node2Country =
nodeArray[1].getCountryElement().getCountry().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node2City =
nodeArray[1].getCityElement().getCity().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node2Institution =
nodeArray[1].getInstitutionElement().getInstitution().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}


@@ -380,19 +380,19 @@

try {
nodeName =
nodeArray[0].getNameElement().getName().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
nodeCountry =
nodeArray[0].getCountryElement().getCountry().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
nodeCity =
nodeArray[0].getCityElement().getCity().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
nodeInstitution =
nodeArray[0].getInstitutionElement().getInstitution().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}

String node;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2012-12-07 21:12:27 UTC (rev 6061)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2012-12-08 15:12:47 UTC (rev 6062)
@@ -157,7 +157,7 @@
String linkGlobalName = "";
try {
linkGlobalName =
link.getGlobalNameElement().getGlobalName().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}


@@ -236,19 +236,19 @@

try {
node1Name =
nodeArray[0].getNameElement().getName().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node1Country =
nodeArray[0].getCountryElement().getCountry().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node1City =
nodeArray[0].getCityElement().getCity().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node1Institution =
nodeArray[0].getInstitutionElement().getInstitution().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}


@@ -259,19 +259,19 @@

try {
node2Name =
nodeArray[1].getNameElement().getName().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node2Country =
nodeArray[1].getCountryElement().getCountry().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node2City =
nodeArray[1].getCityElement().getCity().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
node2Institution =
nodeArray[1].getInstitutionElement().getInstitution().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}


@@ -372,19 +372,19 @@

try {
nodeName =
nodeArray[0].getNameElement().getName().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
nodeCountry =
nodeArray[0].getCountryElement().getCountry().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
nodeCity =
nodeArray[0].getCityElement().getCity().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}
try {
nodeInstitution =
nodeArray[0].getInstitutionElement().getInstitution().trim();
- } catch (Exception ex) {
+ } catch (RuntimeException ignored) {
}

String node;

---

• [pS-dev] [GEANT/SA2/ps-java-services] r6062 - in trunk: perfsonar-java-sql-ma/src/main/java/org/perfso nar/service/measurementArchive/sqlType perfsonar-java-sql- ma/src/main/resources perfsonar-java-sql-ma/src/main/resou rces/perfsonar/conf perfsonar_base/src/main/java/org/per fsonar/base/auxiliary/components/scheduler perfsonar_bas e/src/main/java/org/perfsonar/base/nmwg/owamp perfsonar_ base/src/main/java/org/perfsonar/base/util perfsonar_bas e/src/main/java/org/perfsonar/client/testHarness perfsonar _base/src/main/java/org/perfsonar/service/base/authn per fsonar_base/src/main/java/org/perfsonar/service/base/reg istration perfsonar_base/src/main/java/org/perfsonar/ser vice/base/storage/xmldb perfsonar_base/src/main/java/org /perfsonar/service/base/storage/xmldb/exist/rest perfsonar _base/src/main/java/org/perfsonar/service/base/storage/x mldb/exist/xmlrpc perfsonar_base/src/main/java/org/perfs onar/service/base/web perfsonar_base/src/main/java/org/p erfsonar/service/measurementArchive/meta dataConfig perfso nar_base/src/main/java/org/perfsonar/service/measurement Archive/metadataConfig/keyGenerator perfsonar_base/src/m ain/java/org/perfsonar/service/measurementArchive/metadata Config/queryGenerator, svn-noreply, 12/08/2012

---

Archive powered by MHonArc 2.6.16.