Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r5998 - in trunk: perfsonar-java-sql-ma/src/main/java/org/perfso nar/service/measurementArchive/sqlType perfsonar-java-sql- ma/src/main/java/org/perfsonar/service/measurementArchive/ sqlType/store perfsonar_base/src/main/java/org/perfsonar /service/base/registration perfsonar_base/src/main/java/ org/perfsonar/service/base/storage/xmldb/exist/rest perfso nar_base/src/main/java/org/perfsonar/service/measurement Archive/metadataConfig perfsonar_base/src/main/java/org/ perfsonar/service/measurementArchive/metadataConfig/keyGen erator perfsonar_base/src/main/java/org/perfsonar/servic e/measurementArchive/metadataConfig/queryGenerator

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r5998 - in trunk: perfsonar-java-sql-ma/src/main/java/org/perfso nar/service/measurementArchive/sqlType perfsonar-java-sql- ma/src/main/java/org/perfsonar/service/measurementArchive/ sqlType/store perfsonar_base/src/main/java/org/perfsonar /service/base/registration perfsonar_base/src/main/java/ org/perfsonar/service/base/storage/xmldb/exist/rest perfso nar_base/src/main/java/org/perfsonar/service/measurement Archive/metadataConfig perfsonar_base/src/main/java/org/ perfsonar/service/measurementArchive/metadataConfig/keyGen erator perfsonar_base/src/main/java/org/perfsonar/servic e/measurementArchive/metadataConfig/queryGenerator


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r5998 - in trunk: perfsonar-java-sql-ma/src/main/java/org/perfso nar/service/measurementArchive/sqlType perfsonar-java-sql- ma/src/main/java/org/perfsonar/service/measurementArchive/ sqlType/store perfsonar_base/src/main/java/org/perfsonar /service/base/registration perfsonar_base/src/main/java/ org/perfsonar/service/base/storage/xmldb/exist/rest perfso nar_base/src/main/java/org/perfsonar/service/measurement Archive/metadataConfig perfsonar_base/src/main/java/org/ perfsonar/service/measurementArchive/metadataConfig/keyGen erator perfsonar_base/src/main/java/org/perfsonar/servic e/measurementArchive/metadataConfig/queryGenerator
  • Date: Tue, 11 Sep 2012 08:41:36 +0100 (BST)
Author: nordunet.behrmann
Date: 2012-09-11 08:41:36 +0100 (Tue, 11 Sep 2012)
New Revision: 5998

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/store/L2PathStatusStoreRequestProcess.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSListAddresses.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/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:
Remove unnecessary semicolons

Fixed 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-09-11 07:41:35 UTC (rev 5997)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2012-09-11 07:41:36 UTC (rev 5998)
@@ -717,7 +717,8 @@
try {
mergerNames =

configuration.getProperty("service.ma.base_chaining_mergers");
- } catch (Exception ex) {;}
+ } catch (Exception ex) {
+ }

if (mergerNames == null || mergerNames.trim().equals(""))
return message;
@@ -924,7 +925,8 @@

String serviceType =
configuration.getProperty("service.r.service_type");
String serviceName = null;
- try { serviceName = configuration.getProperty("service.name"); }
catch (Exception ex) {;}
+ try { serviceName = configuration.getProperty("service.name"); }
catch (Exception ex) {
+ }
if (serviceName == null) serviceName = "pS" + serviceType;

Message response = null;
@@ -963,7 +965,8 @@

String serviceType =
configuration.getProperty("service.r.service_type");
String serviceName = null;
- try { serviceName = configuration.getProperty("service.name"); }
catch (Exception ex) {;}
+ try { serviceName = configuration.getProperty("service.name"); }
catch (Exception ex) {
+ }
if (serviceName == null) serviceName = "pS" + serviceType;

Message keyMessage = null;
@@ -1094,7 +1097,6 @@
try {
eventType = metadata.getEventType().getEventType();
} catch (Exception ex1) {
- ;
}

for (Object d : msg.getDataMap().values()) {

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
2012-09-11 07:41:35 UTC (rev 5997)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
2012-09-11 07:41:36 UTC (rev 5998)
@@ -86,7 +86,6 @@
ibatisParams.put("timeValue", (int)timeValueLong);

} catch (Exception ex) {
- ;
}

}

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-09-11 07:41:35 UTC (rev 5997)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSListAddresses.java
2012-09-11 07:41:36 UTC (rev 5998)
@@ -54,7 +54,7 @@
addFromURL(urls, s);
} catch (Exception ex) { /* just omit */ }
}
- } catch (RuntimeException rex) {};
+ } catch (RuntimeException rex) {}
}

/**

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-09-11 07:41:35 UTC (rev 5997)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlDataRepository.java
2012-09-11 07:41:36 UTC (rev 5998)
@@ -24,8 +24,8 @@
}


- public void open() throws PerfSONARException {};
-
- public void close() throws PerfSONARException {};
+ public void open() throws PerfSONARException {}

+ public void close() throws PerfSONARException {}
+
}

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-09-11 07:41:35 UTC (rev 5997)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2012-09-11 07:41:36 UTC (rev 5998)
@@ -377,7 +377,6 @@
xmldbAccess =
configuration.getProperty("component.ma.xmldb.db_access");
} catch (Exception ex) {
- ;
}

if (xmldbAccess == null || xmldbAccess.equals(""))

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-09-11 07:41:35 UTC (rev 5997)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/L2PathStatusKeyGenerator.java
2012-09-11 07:41:36 UTC (rev 5998)
@@ -41,7 +41,6 @@
ibatisServiceConfigParameter =

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

if (!ibatisServiceConfigParameter.trim().equals("")) {

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-09-11 07:41:35 UTC (rev 5997)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2012-09-11 07:41:36 UTC (rev 5998)
@@ -166,7 +166,6 @@
try {
linkGlobalName =
link.getGlobalNameElement().getGlobalName().trim();
} catch (Exception ex) {
- ;
}


@@ -243,10 +242,14 @@
String node1City = "";
String node1Institution = "";

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


String node2Name = "";
@@ -254,10 +257,14 @@
String node2City = "";
String node2Institution = "";

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



@@ -354,10 +361,14 @@
String nodeCity = "";
String nodeInstitution = "";

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

String node = null;
if (nodeName == "" && nodeCountry == "" && nodeCity == "" &&
nodeInstitution == "")

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-09-11 07:41:35 UTC (rev 5997)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2012-09-11 07:41:36 UTC (rev 5998)
@@ -170,7 +170,6 @@
try {
linkGlobalName =
link.getGlobalNameElement().getGlobalName().trim();
} catch (Exception ex) {
- ;
}


@@ -247,10 +246,14 @@
String node1City = "";
String node1Institution = "";

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


String node2Name = "";
@@ -258,10 +261,14 @@
String node2City = "";
String node2Institution = "";

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



@@ -358,10 +365,14 @@
String nodeCity = "";
String nodeInstitution = "";

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

String node = null;
if (nodeName == "" && nodeCountry == "" && nodeCity == "" &&
nodeInstitution == "")


  • [pS-dev] [GEANT/SA2/ps-java-services] r5998 - in trunk: perfsonar-java-sql-ma/src/main/java/org/perfso nar/service/measurementArchive/sqlType perfsonar-java-sql- ma/src/main/java/org/perfsonar/service/measurementArchive/ sqlType/store perfsonar_base/src/main/java/org/perfsonar /service/base/registration perfsonar_base/src/main/java/ org/perfsonar/service/base/storage/xmldb/exist/rest perfso nar_base/src/main/java/org/perfsonar/service/measurement Archive/metadataConfig perfsonar_base/src/main/java/org/ perfsonar/service/measurementArchive/metadataConfig/keyGen erator perfsonar_base/src/main/java/org/perfsonar/servic e/measurementArchive/metadataConfig/queryGenerator, svn-noreply, 09/11/2012

Archive powered by MHonArc 2.6.16.

Top of Page