Chronological Thread 

< Chronological >      < Thread >

---

Author: nordunet.behrmann
Date: 2012-09-11 08:41:46 +0100 (Tue, 11 Sep 2012)
New Revision: 6004

Modified:

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/BaseChainingMergerFactory.java

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java

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/fetch/ResponseGeneratorFactory.java

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcessFactory.java

trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/AuxiliaryComponentManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java

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/actions/SchedulerAction.java

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

trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/TimeDateUtil.java
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/TrieNode.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/axis/AxisClient.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java

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

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

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

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

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

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

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/engine/ServiceEngineFactory.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/BaseChaining.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/EchoRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MessageHandlerFactory.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/ExistDbFactory.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/ExistDbHttpXmlStorageManager.java

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

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/util/ResultCodesUtil.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandler.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/SimpleMetadataConfigurationStorageManager.java

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

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

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

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

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

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.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

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

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

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

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

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/register/LSRegistrationComponent.java
Log:
Remove unused assignments

Found and fixed by IntelliJ.

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/BaseChainingMergerFactory.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/BaseChainingMergerFactory.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/BaseChainingMergerFactory.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -37,7 +37,7 @@
if (mergerName.isEmpty())
continue;

- BaseChaining baseChainingMerger = null;
+ BaseChaining baseChainingMerger;
try {

baseChainingMerger = (BaseChaining)

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -121,13 +121,13 @@

String pname = p.getParameterName();
//String pvalue = p.getParameterValue();
- String pvalue = "";
+ String pvalue;

//logger.debug("SQLStorageManager.fetch: param [name,
value]: ["
// + pname + ", " + pvalue + "]");

if (pname.equals("startTime")) {
- long startTime = 0;
+ long startTime;
pvalue = TimeDateUtil.getUnixTime(p);
try {
startTime = Long.parseLong(pvalue);
@@ -141,7 +141,7 @@
ibatisParams.put(pname, startTime);

} else if (pname.equals("endTime")) {
- long endTime = 0;
+ long endTime;
pvalue = TimeDateUtil.getUnixTime(p);
try {
endTime = Long.parseLong(pvalue);
@@ -162,7 +162,7 @@
}
}

- Data data = null;
+ Data data;


// ibatis action
@@ -170,11 +170,11 @@
try {

String resource = (String) ibatisParams.get("ibatisConfig");
- SqlMapClient sqlMap = null;
+ SqlMapClient sqlMap;
Reader reader = Resources.getResourceAsReader(resource);
sqlMap = SqlMapClientBuilder.buildSqlMapClient(reader);

- List resultList = null;
+ List resultList;

if (ibatisParams.get("time") != null) {

@@ -270,7 +270,7 @@
try {

String resource = (String) ibatisParams.get("ibatisConfig");
- SqlMapClient sqlMap = null;
+ SqlMapClient sqlMap;
Reader reader = Resources.getResourceAsReader(resource);
sqlMap = SqlMapClientBuilder.buildSqlMapClient(reader);


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:44 UTC (rev 6003)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -257,7 +257,7 @@

Message query = new Message();
query.addChild(metadata);
- Message resp = null;
+ Message resp;

try {
resp = metadataConfig.fetch(query);
@@ -284,7 +284,7 @@
// metadata does not exist in xmldb

// getting default ibatis parameter from service.properties
- String ibatis_config_str = "";
+ String ibatis_config_str;
try {
ibatis_config_str =

configuration.getProperty("service.ma.sql.default_ibatis_config");
@@ -496,7 +496,7 @@
+ "Received a request of type - "
+ actionType);

- Message response = null;
+ Message response;

if (actionType.equals(ActionType.GET_KEY)) {

@@ -593,7 +593,7 @@

public static String getSeq() {

- String strSeq = null;
+ String strSeq;
try {
seq = seq + 1;
strSeq = Long.toString(seq);
@@ -729,7 +729,7 @@
if (baseChainingMergers == null)
return message;

- BaseChaining baseChaining = null;
+ BaseChaining baseChaining;

for (Object baseChainingMerger : baseChainingMergers) {

@@ -782,7 +782,7 @@

} else {

- String eventType = null;
+ String eventType;
try {
eventType =
metadata.getEventType().getEventType().trim();
} catch (Exception ex) {
@@ -801,9 +801,8 @@

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

- Key key = null;
- if ((key = ((Data)d).getKey()) != null) {
- key = ((Data)d).getKey();
+ Key key = ((Data)d).getKey();
+ if (key != null) {
key.setParameters(params);
}

@@ -823,7 +822,7 @@

} else {

- Key key = null;
+ Key key;

if ((key = metadata.getKey()) != null) {

@@ -896,14 +895,14 @@
EventType eventType = metadata.getEventType();
String eventTypeStr = eventType.getEventType().trim();

- String testName = null;
+ String testName;
try {
testName =
eventTypeStr.substring(eventTypeStr.lastIndexOf("/")+1,
eventTypeStr.length());
} catch (Exception ex) {
testName = "test";
}

- Message response = null;
+ Message response;

if (eventTypeStr.equals(ECHO_XMLDB_ACCESS_TEST_NAMESPACE)
|| eventTypeStr.equals(ECHO_XMLDB_CONTENT_TEST_NAMESPACE))
@@ -928,9 +927,9 @@
}
if (serviceName == null) serviceName = "pS" + serviceType;

- Message response = null;
- Data data = null;
- String eventTypeStr = null;
+ Message response;
+ Data data;
+ String eventTypeStr;

try {

@@ -968,7 +967,7 @@
}
if (serviceName == null) serviceName = "pS" + serviceType;

- Message keyMessage = null;
+ Message keyMessage;
try {
keyMessage = metadataConfig.fetch(request);
} catch (PerfSONARException psEx) {
@@ -977,7 +976,7 @@
psEx.getResultDescription());
}

- Data keyData = null;
+ Data keyData;
try {
keyData = keyMessage.getDataArray()[0];
} catch (Exception ex) {
@@ -1029,7 +1028,7 @@
Data data = new Data();
data.setMetadataIdRef(metadata.getId());

- Message testMessage = null;
+ Message testMessage;
testMessage =
getEcho(getTestEchoRequest(ECHO_XMLDB_ACCESS_TEST_NAMESPACE));
buildSelfTestResponseMessage(testMessage.getMetadataIterator(),
data);
buildSelfTestResponseMessage(testMessage.getDataIterator(), data);

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGeneratorFactory.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGeneratorFactory.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGeneratorFactory.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -67,7 +67,7 @@
+ eventTypeName);


- ResponseGenerator responseGenerator = null;
+ ResponseGenerator responseGenerator;

try {


Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcessFactory.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcessFactory.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcessFactory.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -66,7 +66,7 @@
+ eventTypeName);


- StoreRequestProcess storeRequestProcess = null;
+ StoreRequestProcess storeRequestProcess;

try {


Modified:
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -46,7 +46,7 @@
list.add(row);

String s = "";
- java.util.Vector datumTest = new java.util.Vector();
+ java.util.Vector datumTest;

//when
try{
@@ -105,7 +105,7 @@
list.add(row);

String s = "";
- java.util.Vector datumTest = new java.util.Vector();
+ java.util.Vector datumTest;

//when
try{

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/AuxiliaryComponentManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/AuxiliaryComponentManager.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/AuxiliaryComponentManager.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -126,7 +126,7 @@
return components.get(componentName);
}

- AuxiliaryComponent component = null;
+ AuxiliaryComponent component;

try {
//create component from classname
@@ -240,7 +240,7 @@
return null;
}

- URL url = null;
+ URL url;
// try WEB-INF
logger.finer("WEB-INF:"+componentManager.webInfLocation);
if(componentManager.webInfLocation != null) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -25,10 +25,10 @@
public ArrayList<Entry> readFile(String filename) throws IOException {

ArrayList<Entry> listProperties = new ArrayList<Entry>();
- BufferedReader input = null;
+ BufferedReader input;

input = new BufferedReader(new FileReader(filename));
- String line = null; // not declared within while loop
+ String line; // not declared within while loop
while ((line = input.readLine()) != null) {

String trimmed = line.trim();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -85,7 +85,7 @@
}

public String getAliasForX509Cert(byte[] skiBytes) throws
WSSecurityException {
- Certificate cert = null;
+ Certificate cert;

try {
for (Enumeration<String> e = keystore.aliases();
e.hasMoreElements();) {
@@ -135,9 +135,9 @@
boolean useSerialNumber)
throws WSSecurityException {
Vector<String> issuerRDN = splitAndTrim(issuer);
- X509Certificate x509cert = null;
- Vector<String> certRDN = null;
- Certificate cert = null;
+ X509Certificate x509cert;
+ Vector<String> certRDN;
+ Certificate cert;

try {
for (Enumeration<String> e = keystore.aliases();
e.hasMoreElements();) {
@@ -173,8 +173,8 @@

public String getAliasForX509CertThumb(byte[] thumb)
throws WSSecurityException {
- Certificate cert = null;
- MessageDigest sha = null;
+ Certificate cert;
+ MessageDigest sha;

try {
sha = MessageDigest.getInstance("SHA-1");
@@ -236,7 +236,7 @@
// Store the aliases found
Vector<String> aliases = new Vector<String>();

- Certificate cert = null;
+ Certificate cert;

// The DN to search the keystore for
Vector<String> subjectRDN = splitAndTrim(subjectDN);
@@ -253,7 +253,6 @@
if (cert == null) {
return null;
}
- certs = new Certificate[]{cert};
} else {
cert = certs[0];
}
@@ -323,7 +322,7 @@

public X509Certificate[] getCertificates(String alias)
throws WSSecurityException {
- Certificate[] certs = null;
+ Certificate[] certs;
try {
certs = keystore.getCertificateChain(alias);
if (certs == null || certs.length == 0) {
@@ -421,7 +420,7 @@
public X509Certificate[] getX509Certificates(byte[] data, boolean
reverse)
throws WSSecurityException {
InputStream in = new ByteArrayInputStream(data);
- CertPath path = null;
+ CertPath path;
try {
path = getCertificateFactory().generateCertPath(in);
} catch (CertificateException e) {
@@ -439,7 +438,7 @@

public X509Certificate loadCertificate(InputStream in)
throws WSSecurityException {
- X509Certificate cert = null;
+ X509Certificate cert;
try {
cert =
(X509Certificate)
getCertificateFactory().generateCertificate(in);

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -63,8 +63,8 @@
throw new PerfSONARException(m);
}
try {
- String checkAuthNParam=null;
- String checkAuthRParam=null;
+ String checkAuthNParam;
+ String checkAuthRParam;
try {

checkAuthNParam=configuration.getProperty(AuthNComponent.CHECK_AUTHN_PARAM);
} catch (PerfSONARException e) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -62,14 +62,12 @@
"ExpressionMapping: read mapping config file:" + filename);

ComponentsConfigurationReader confread =
- new ComponentsConfigurationReader();
-
- ArrayList<ComponentsConfigurationReader.Entry> l = null;
+ new ComponentsConfigurationReader();
+
try {
- l = confread.readFile(filename);
- for (ComponentsConfigurationReader.Entry e : l)
+ for (ComponentsConfigurationReader.Entry e :
confread.readFile(filename)) {
mappings.put(e.getName(), e.getValue());
- l = null;
+ }
} catch (IOException e1) {
logger.error("ExpressionMapping: read mapping config file:"
+ filename);

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-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -123,10 +123,10 @@

logger.debug("Scheduler.readSchedules: Scheduler has been woken up
to read schedules");

- String xmlDbURL = null;
- String userName = null;
- String password = null;
- String community = null;
+ String xmlDbURL;
+ String userName;
+ String password;
+ String community;

try{
xmlDbURL =
this.configurationComponent.getProperty("Scheduler.Database.XML.location");
@@ -309,8 +309,8 @@
String[] scheduleChain = new String[1];
scheduleChain[0] = metadataLeafResults[0];

- String nextNodeIdRef = null;
- boolean moreNodesInChain = true;
+ String nextNodeIdRef;
+ boolean moreNodesInChain;


try {
@@ -375,7 +375,7 @@
Metadata metadataElement = (Metadata)
parser.getElement("metadata");

Subject subjectElement =
metadataElement.getSubject();
- String metadataIdRef = null;
+ String metadataIdRef;
metadataIdRef = subjectElement.getMetadataIdRef();

if(!(metadataIdRef == null ||
metadataIdRef.equalsIgnoreCase(""))) {
@@ -405,7 +405,7 @@

System.arraycopy(scheduleChain, 0, newScheduleChain, 1,
scheduleChain.length);

- scheduleChain = null; scheduleChain =
newScheduleChain;
+ scheduleChain = newScheduleChain;

scheduleChain[0]=nextMetadataResults[0];


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -160,7 +160,7 @@
String eventTypeInterfaceName =
eventTypeString.concat("_interface");
eventTypeClassName =
"SchedulerAction.".concat(eventTypeClassName);
eventTypeInterfaceName =
"SchedulerAction.".concat(eventTypeInterfaceName);
- String handlerClassName = null;
+ String handlerClassName;

try {

@@ -182,7 +182,7 @@
" to use class: " + handlerClassName + " for this event
type");


- Class handlerClass = null;
+ Class handlerClass;
try {

handlerClass = Class.forName(handlerClassName);
@@ -210,7 +210,7 @@

}

- Class[] interfaceClasses = null;
+ Class[] interfaceClasses;
interfaceClasses = handlerClass.getInterfaces();

String matchedInterfaceClassName = null;
@@ -228,7 +228,7 @@

for (Class interfaceClass : interfaceClasses) {

- String interfaceClassName = null;
+ String interfaceClassName;
interfaceClassName = interfaceClass.getName();


@@ -262,15 +262,13 @@
// to purposely have it here
if (matchedInterfaceClassName == null) {

- String interfaceNameFromProperties = null;
+ String interfaceNameFromProperties;
System.out.println("eventTypeInterfaceName: " +
eventTypeInterfaceName);
try {
interfaceNameFromProperties =

this.configurationComponent.getProperty(eventTypeInterfaceName);
} catch (PerfSONARException e2) {

- matchedInterfaceClassName = null;
-
logger.error("SchedulerAction: The eventType in the
schedule: " + eventTypeString + " " +
"has been configured to be handled by the " +
"class: " + handlerClassName + ". But
SchedulerAction (generic) is not " +
@@ -292,7 +290,7 @@

try {

- Message replyMessage = null;
+ Message replyMessage;

if (matchedInterfaceClassName.equals

("net.geant2.monitoring.nms.service.commons.engine.ServiceEngine") ||

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-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/nmwg/owamp/Parameters.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -47,8 +47,7 @@
name.equals("size") ||
name.equals("output") ||
name.equals("direction")) {

- Parameter p = new Parameter();
- p = (Parameter)parameterMap.get(name);
+ Parameter p =
(Parameter)parameterMap.get(name);
return(p);
}
else {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/NetUtil.java
===================================================================
--- trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/NetUtil.java
2012-09-11 07:41:44 UTC (rev 6003)
+++ trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/NetUtil.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -22,7 +22,7 @@
*/
public static boolean validateIPv4Address(String ipv4AddressString){

- String[] splitByDot = new String[6];
+ String[] splitByDot;
splitByDot = ipv4AddressString.split("[.]+");

if(splitByDot.length>4)

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/TimeDateUtil.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/TimeDateUtil.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/TimeDateUtil.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -82,7 +82,7 @@
+ "it should be time type");

Time time = (Time) subelement;
- String unixTimeString = "";
+ String unixTimeString;

if (time.getType().trim().equalsIgnoreCase("unix")) {


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-09-11 07:41:44 UTC (rev 6003)
+++ trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -65,7 +65,7 @@
*/
public static String convertEntitiesToCharacters(String input) {

- String output = input;
+ String output;

//&lt;
output = input.replaceAll("\\&lt\\;", "<");
@@ -416,7 +416,7 @@
public static Document convertXMLFileToDom(String file) throws
PerfSONARException{

DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- Document dom = null;
+ Document dom;
try {

DocumentBuilder db = dbf.newDocumentBuilder();
@@ -498,7 +498,7 @@

public Map<String, Element> getElement(String[] names) {
Map<String, Element> map = new HashMap<String, Element>();
- Element element = null;
+ Element element;
boolean found = false;

for (String name : names) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/TrieNode.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/TrieNode.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/TrieNode.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -294,11 +294,10 @@
TrieNode c1 = node.getChildOne();
long key = node.getKey();
long mask = Constants.MAX_KEY_LENGTH - position;
- String keyString;
String addrString;

if (key == -1) {
- addrString = keyString = "\"" + "0.0.0.0/0" + "\"";
+ addrString = "\"" + "0.0.0.0/0" + "\"";
currentKey = 0;
p.println(addrString + "
[shape=record,label=\"<f0>0.0.0.0/0|<f1>"
+ node.getChildCount()
@@ -306,7 +305,7 @@
}
else {
key = currentKey;
- keyString = helper.longToIP(key);
+ String keyString = helper.longToIP(key);
String unquotedAddrString = keyString + "/" + mask;
addrString = "\"" + keyString + "/" + mask + "\"";
if (node.getData() == null) {
@@ -352,18 +351,15 @@
TrieNode c1 = this.getChildOne();
long key = this.getKey();
long mask = Constants.MAX_KEY_LENGTH - position;
- String keyString;
- String addrString;
TrieNode node = this;

if (key == -1) {
- addrString = keyString = "0.0.0.0/0";
currentKey = 0;
}
else {
key = currentKey;
- keyString = helper.longToIP(key);
- addrString = keyString + "/" + mask;
+ String keyString = helper.longToIP(key);
+ String addrString = keyString + "/" + mask;
if (node.getData() == null) {
listOfNodes.add(addrString);
}
@@ -400,18 +396,15 @@
TrieNode c1 = this.getChildOne();
long key = this.getKey();
long mask = Constants.MAX_KEY_LENGTH - position;
- String keyString;
- String addrString;
TrieNode node = this;

if (key == -1) {
- addrString = keyString = "0.0.0.0/0";
currentKey = 0;
}
else {
key = currentKey;
- keyString = helper.longToIP(key);
- addrString = keyString + "/" + mask;
+ String keyString = helper.longToIP(key);
+ String addrString = keyString + "/" + mask;
if (node.getData() == null &&
( c0.getData() != null ||
c1.getData() != null )) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/axis/AxisClient.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/axis/AxisClient.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/axis/AxisClient.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -55,7 +55,7 @@
// we will now extract the result from the vector
SOAPBodyElement resultSBE;

- Document resultDocument = null;
+ Document resultDocument;

resultSBE= (SOAPBodyElement)((Vector)resultObject).get(0);


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -76,7 +76,7 @@
java.security.Security.addProvider((Provider)bcp);

// add the private and public keys
- Crypto crypto = null;
+ Crypto crypto;
try {
crypto = new DynamicCrypto();
} catch (CredentialException e) {
@@ -208,7 +208,7 @@


private void adjustTime(WSSecTimestamp timestamp, int range) throws
WSSecurityException {
- DateFormat zulu = null;
+ DateFormat zulu;
if (WSSConfig.getDefaultWSConfig().isPrecisionInMilliSeconds()) {
zulu = new XmlSchemaDateFormat();
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -60,7 +60,7 @@
java.security.Security.addProvider((Provider)bcp);

// add the private and public keys
- Crypto crypto = null;
+ Crypto crypto;
try {
crypto = new DynamicCrypto();
} catch (CredentialException e) {
@@ -85,7 +85,7 @@
BouncyCastleProvider bcp = new BouncyCastleProvider();
java.security.Security.addProvider((Provider)bcp);

- Crypto crypto = null;
+ Crypto crypto;
try {
crypto = new DynamicCrypto();
} catch (CredentialException e) {
@@ -183,7 +183,7 @@
}

private void adjustTime(WSSecTimestamp timestamp, int range) throws
WSSecurityException {
- DateFormat zulu = null;
+ DateFormat zulu;
if (WSSConfig.getDefaultWSConfig().isPrecisionInMilliSeconds()) {
zulu = new XmlSchemaDateFormat();
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPClient.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPClient.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPClient.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -45,9 +45,9 @@

try {

- String endPoint = null;
- String inputFile = null;
- String outputFile = null;
+ String endPoint;
+ String inputFile;
+ String outputFile;

if (args.length == 3) {

@@ -75,7 +75,7 @@

// read the request into a org.w3c.DOM.Document

- Document request = null;
+ Document request;
DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);

@@ -105,7 +105,7 @@
// we will now extract the result from the vector

SOAPBodyElement resultSBE;
- Document result = null;
+ Document result;

try {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -55,15 +55,15 @@

public void test(String[] args) {
try {
- String saslCAServer = null;
- String saslCAPort = null;
- String tsFile = null;
- String tsPassword = null;
- String tsType = null;
- String username = null;
- String userpassword = null;
- String endPoint = null;
- String messageFile = null;
+ String saslCAServer;
+ String saslCAPort;
+ String tsFile;
+ String tsPassword;
+ String tsType;
+ String username;
+ String userpassword;
+ String endPoint;
+ String messageFile;

if (args.length == 9) {
saslCAServer = args[0];
@@ -133,7 +133,7 @@
call.setTargetEndpointAddress(new URL(endPoint));
call.setOperationName(new
QName("http://soapinterop.org/","submit";));

- Document request = null;
+ Document request;
DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);

@@ -191,20 +191,12 @@
org.apache.axis.Message signedMsg = (org.apache.axis.Message)
SOAPUtil.toSOAPMessage(signedDoc);
envelope = signedMsg.getSOAPEnvelope();

- // get a timestamp.
- double startTime =
- new Long(System.currentTimeMillis()).doubleValue();
-
// call on the end point
Object resultObject = call.invoke(envelope);

- // get another timestamp
- double endTime =
- new Long(System.currentTimeMillis()).doubleValue();
-
SOAPEnvelope envelopeResult;
SOAPBodyElement resultSBE;
- Document result = null;
+ Document result;

envelopeResult= (SOAPEnvelope)resultObject;
resultSBE= envelopeResult.getFirstBody();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -36,11 +36,11 @@
@SuppressWarnings(value={"deprecation"})
public void makeRequest(String[] args) {
try {
- String endPoint = null;
- String inputFile = null;
- String outputFile = null;
- String keyFile = null;
- String certFile = null;
+ String endPoint;
+ String inputFile;
+ String outputFile;
+ String keyFile;
+ String certFile;
if (args.length == 5) {
endPoint = args[0];
inputFile = args[1];
@@ -71,7 +71,7 @@
call.setOperationName(new
QName("http://soapinterop.org/","submit";));

// read the request into a org.w3c.DOM.Document
- Document request = null;
+ Document request;
DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);

@@ -102,7 +102,7 @@

SOAPEnvelope envelopeResult;
SOAPBodyElement resultSBE;
- Document result = null;
+ Document result;
try {

envelopeResult= (SOAPEnvelope)resultObject;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -65,15 +65,15 @@

public void test(String[] args) {
try {
- String saslCAServer = null;
- String saslCAPort = null;
- String tsFile = null;
- String tsPassword = null;
- String tsType = null;
- String username = null;
- String userpassword = null;
- String oper = null;
- String endPoint = null;
+ String saslCAServer;
+ String saslCAPort;
+ String tsFile;
+ String tsPassword;
+ String tsType;
+ String username;
+ String userpassword;
+ String oper;
+ String endPoint;

if (args.length == 9) {
saslCAServer = args[0];
@@ -220,7 +220,7 @@

SOAPEnvelope envelopeResult;
SOAPBodyElement resultSBE;
- Document result = null;
+ Document result;

envelopeResult= (SOAPEnvelope)resultObject;
resultSBE= envelopeResult.getFirstBody();
@@ -311,7 +311,7 @@

SOAPEnvelope envelopeResult;
SOAPBodyElement resultSBE;
- Document result = null;
+ Document result;

envelopeResult= (SOAPEnvelope)resultObject;
resultSBE= envelopeResult.getFirstBody();
@@ -357,7 +357,7 @@

Message authrRequest = new
AuthREERequestGenerator().generateRequestMessage();

- SimpleRequest simpleRequest = null;
+ SimpleRequest simpleRequest;
simpleRequest =
RequestFactory.getDefaultSimpleRequest();
simpleRequest.setResource(authrReq.getResource());
simpleRequest.setAction(authrReq.getAction());
@@ -415,7 +415,7 @@

SOAPEnvelope envelopeResult;
SOAPBodyElement resultSBE;
- Document result = null;
+ Document result;

envelopeResult= (SOAPEnvelope)resultObject;
resultSBE= envelopeResult.getFirstBody();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -104,7 +104,7 @@

private Document updateSecurityTokenParameter(Document request,
Message requestMessage, SecurityToken token) throws TransformerException {
// get the parameter which specifies the format of the
security token
- Parameters params=null;
+ Parameters params;
Parameter parameter=null;
Metadata[] mds=requestMessage.getMetadataArray();
for (Metadata md : mds) {
@@ -173,7 +173,7 @@

SOAPEnvelope envelopeResult;
SOAPBodyElement resultSBE;
- Document result = null;
+ Document result;

envelopeResult= (SOAPEnvelope)resultObject;
resultSBE= envelopeResult.getFirstBody();
@@ -193,7 +193,7 @@
}

public AuthNResponse getAuthentication(AuthNRequest req) throws
PerfSONARException {
- AuthNResponse resp=new AuthNResponse();
+ AuthNResponse resp;
// prepare to call - set service elements
try {

@@ -224,7 +224,7 @@

Message authrRequest = new
AuthREERequestGenerator().generateRequestMessage();

- SimpleRequest simpleRequest = null;
+ SimpleRequest simpleRequest;
if
(SecTokenSOAPManager.isDelegated(req.getSecurityToken())) {
simpleRequest =
RequestFactory.getDefaultSimpleDelegatedRequest();
}

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-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -144,7 +144,7 @@

private Document getDocumentFromString(String message) {
try {
- Document request = null;
+ Document request;
DocumentBuilderFactory factory =
DocumentBuilderFactory
.newInstance();
factory.setNamespaceAware(true);

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/engine/ServiceEngineFactory.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/engine/ServiceEngineFactory.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/engine/ServiceEngineFactory.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -35,7 +35,7 @@
// get a logger
LoggerComponent logger = (LoggerComponent)
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);

- Class<?> engineClass = null;
+ Class<?> engineClass;

// try to get the class for the given className
try {
@@ -49,7 +49,7 @@
);
}

- ServiceEngine engine = null;
+ ServiceEngine engine;

// get an instance of it
try {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/BaseChaining.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/BaseChaining.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/BaseChaining.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -66,7 +66,7 @@

// -- metadata

- Metadata newMetadata = null;
+ Metadata newMetadata;
Iterator metaIt = message.getMetadataIterator();
while (metaIt.hasNext()) {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -117,7 +117,7 @@
Message atomReq = new Message();
atomReq.setType(reqMessage.getType());

- Message atomResp = null;
+ Message atomResp;

List<Metadata> mdChain = new ArrayList<Metadata>();


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/EchoRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/EchoRequest.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/EchoRequest.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -113,7 +113,7 @@
+ "eventType element");
}

- Message response = null;
+ Message response;

if (eventType.getEventType().trim().equals(ECHO_NAMESPACE)) {
response = executeSimpleEcho();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -100,9 +100,9 @@

Collection<Metadata> collection =
inputMessage.getMetadataMap().values();

- Subject subject = null;
- Node node = null;
- Vector nodes = null;
+ Subject subject;
+ Node node;
+ Vector nodes;
for (Metadata metadata : collection) {

if ((subject = metadata.getSubject()) != null)

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -137,7 +137,7 @@
+ "eventType element");
}

- Message response = null;
+ Message response;

if (eventType.getEventType().trim().equals(LOOKUP_INFO_NAMESPACE)) {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MessageHandlerFactory.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MessageHandlerFactory.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MessageHandlerFactory.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -51,7 +51,7 @@
}

// try to create a message handler for the given message type.
- MessageHandler handler = null;
+ MessageHandler handler;
try {
// get a new class for that classname
handler = (MessageHandler)
Class.forName(className).newInstance();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/ExistDbFactory.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/ExistDbFactory.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/ExistDbFactory.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -72,7 +72,7 @@
XmlDbDataRepository dataRepository )
throws PerfSONARException {

- XmlDbStorageManager sm = null;
+ XmlDbStorageManager sm;
LoggerComponent logger = getLogger();

if (type.equalsIgnoreCase(EXIST_XMLRPC)) {

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-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHTTPAccess.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -133,7 +133,7 @@
InputStream inputStream) throws IOException {

int hits=-1, first=-1, count=-1;
- String result = null;
+ String result;
String[] resultArray = null;

boolean allowRemoveExistValue = true;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -134,7 +134,7 @@
throws PerfSONARException {

getLogger().debug("ExistDbHttpXmlStorageManager: XQuery");
- XmlDbResult results = null;
+ XmlDbResult results;

try {
results = httpAccess.sendExistXQueryRequest(

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -121,7 +121,7 @@

getLogger().debug("ExistXMLDatabaseAccess: perform XQuery");

- String xqueryExpression = null;
+ String xqueryExpression;
try {
xqueryExpression = (String)dataQuery;
} catch (ClassCastException ex) {
@@ -204,7 +204,7 @@

getLogger().debug("ExistDbXmlrpcXmlStorageManager: perform
XUpdate");

- String xupdateExpression = null;
+ String xupdateExpression;
try {

xupdateExpression = (String)dataSet;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileStorageManager.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileStorageManager.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -63,7 +63,7 @@
throws PerfSONARException {

//check if string
- String xpathQuery = null;
+ String xpathQuery;
try {
xpathQuery = (String)dataQuery;
} catch (RuntimeException ex) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/util/ResultCodesUtil.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/util/ResultCodesUtil.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/util/ResultCodesUtil.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -95,7 +95,7 @@

//metadata

- String metadataId = null;
+ String metadataId;
if (parentMetadataIdRef!=null)
metadataId="resultCodeMetadata_for_"+parentMetadataIdRef;
else metadataId="resultCodeMetadata";
@@ -107,7 +107,7 @@

//data

- String dataId = null;
+ String dataId;
dataId="resultDescriptionData_for_"+metadataId;

Data data =
createResultDescriptionData(dataId,metadataId,pex.getResultDescription());

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-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandler.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -197,7 +197,7 @@

protected void assertAuthentication(Message requestMessage) throws
PerfSONARException {
// Check if it's needed authorization for this type of message
- String checkAuthRParam=null;
+ String checkAuthRParam;
try {

checkAuthRParam=configuration.getProperty(AuthNComponent.CHECK_AUTHR_PARAM);
} catch (PerfSONARException e) {
@@ -211,7 +211,7 @@

authnComponent.requestAuthR(requestMessage.getType(),null);
} else {
// Check if it's needed authentication for this type of
message
- String checkAuthNParam=null;
+ String checkAuthNParam;
try {

checkAuthNParam=configuration.getProperty(AuthNComponent.CHECK_AUTHN_PARAM);
} catch (PerfSONARException e) {
@@ -236,7 +236,7 @@
* @throws PerfSONARException
*/
protected Message convertMessage(Document request) throws
PerfSONARException {
- Message requestMessage = null;
+ Message requestMessage;
try {
if(saxParserConfig == null) {
saxParserConfig =
attemptSaxParserConfigLookup();

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:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -247,7 +247,7 @@

protected void storeElements(Collection collection) throws
PerfSONARException {

- String query = null;
+ String query;
for (Object element : collection) {

if (isAlreadyStored((Element)element)) continue;
@@ -279,7 +279,7 @@

protected String[] executeQuery(String query) throws PerfSONARException {

- Object object = null;
+ Object object;
try {
object = existDbXmlStorageManager.fetch(query);
} catch (Exception ex) {
@@ -297,14 +297,14 @@

public void storeDataElements(Message dataSet) throws PerfSONARException
{

- String metadataIdRef = null;
- Metadata metadata = null;
- EventType eventType = null;
- String eventTypeString = null;
- Key key = null;
- Data newData = null;
+ String metadataIdRef;
+ Metadata metadata;
+ EventType eventType;
+ String eventTypeString;
+ Key key;
+ Data newData;

- MetadataKeyGenerator metadataKeyGenerator = null;
+ MetadataKeyGenerator metadataKeyGenerator;

Collection<Data> collection = dataSet.getDataMap().values();
for (Data data : collection) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -155,12 +155,7 @@
message.addChild(elem);
}

-
- outputBuffer = null;
sbos.close();
- sbos = null;
-
-
} catch (XPathException xpex) {

logger.error(
@@ -244,7 +239,7 @@
String query, Configuration saxonConfig) throws PerfSONARException {

StaticQueryContext staticContext = new
StaticQueryContext(saxonConfig);
- SequenceIterator elements = null;
+ SequenceIterator elements;

try {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -106,7 +106,7 @@
+ "Input message is null");


- Metadata metadata = null;
+ Metadata metadata;
try {
Metadata[] metadataArray = (query.getMetadataArray());
metadata = metadataArray[0];
@@ -122,7 +122,7 @@
}


- String eventType = "";
+ String eventType;
if (metadata != null) {

try {
@@ -150,7 +150,7 @@
MetadataQueryGenerator metadataQueryGenerator =

MetadataQueryGeneratorFactory.getMetadataQueryGenerator(eventType);

- String mq = "";
+ String mq;
try {

mq = metadataQueryGenerator.getMetadataQuery(query);
@@ -186,7 +186,7 @@
public Map<String, Element> transformResults(String xmlPart, String[]
tagNames)
throws PerfSONARException {

- String f = "";
+ String f;
try {
f = configuration.getProperty("service.sax_parser.config");
} catch (PerfSONARException sex) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/MetadataKeyGeneratorFactory.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/MetadataKeyGeneratorFactory.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/MetadataKeyGeneratorFactory.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -53,7 +53,7 @@
+ eventTypeName);


- MetadataKeyGenerator metadataKeyGenerator = null;
+ MetadataKeyGenerator metadataKeyGenerator;

try {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -86,7 +86,7 @@
String dst = "";
String eventType = "";

- Metadata metadata = null;
+ Metadata metadata;
try {
Metadata[] metadataArray = (query.getMetadataArray());
metadata = metadataArray[0];

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -74,22 +74,22 @@
//logger.debug("DiscardsQueryGenerator.getMetadataQuery: "
// + "start getMetadataQuery");

- String eventType = null;
- String keyword = null;
+ String eventType;
+ String keyword;

- String ipAddress = null;
- String hostName = null;
- String ifName = null;
- String ifDescription = null;
- String ifAddress = null;
- String ifAddressType = null;
- String ifIndex = null;
- String type = null;
- String direction = null;
- String classOfService = null;
- String capacity = null;
+ String ipAddress;
+ String hostName;
+ String ifName;
+ String ifDescription;
+ String ifAddress;
+ String ifAddressType;
+ String ifIndex;
+ String type;
+ String direction;
+ String classOfService;
+ String capacity;

- Metadata metadata = null;
+ Metadata metadata;
try {
Metadata[] metadataArray = (query.getMetadataArray());
metadata = metadataArray[0];

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -74,23 +74,22 @@
//logger.debug("UtilizationQueryGenerator.getMetadataQuery: "
// + "start getMetadataQuery");

- String eventType = null;
- String keyword = null;
+ String eventType;
+ String keyword;

- String ipAddress = null;
- String hostName = null;
- String ifName = null;
- String ifDescription = null;
- String ifAddress = null;
- String ifAddressType = null;
- String ifIndex = null;
- String type = null;
- String direction = null;
- String authRealm = null;
- String classOfService = null;
- String capacity = null;
+ String ipAddress;
+ String hostName;
+ String ifName;
+ String ifDescription;
+ String ifAddress;
+ String ifAddressType;
+ String ifIndex;
+ String type;
+ String direction;
+ String classOfService;
+ String capacity;

- Metadata metadata = null;
+ Metadata metadata;
try {
Metadata[] metadataArray = (query.getMetadataArray());
metadata = metadataArray[0];

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -83,13 +83,13 @@
//logger.debug("IperfQueryGenerator.getMetadataQuery: "
// + "start getMetadataQuery");

- String eventType = null;
- String keyword = null;
+ String eventType;
+ String keyword;

- String src = null;
- String dst = null;
+ String src;
+ String dst;

- Metadata metadata = null;
+ Metadata metadata;
try {
Metadata[] metadataArray = (query.getMetadataArray());
metadata = metadataArray[0];
@@ -118,7 +118,7 @@

// iperf parameters
Map<String, String> iperfParametersMap = new
HashMap<String,String>();
- Parameters params = null;
+ Parameters params;
try {
// iperf:parameters
params = (org.ggf.ns.nmwg.tools.iperf.v2_0.Parameters)
metadata.getParameters();
@@ -136,8 +136,8 @@
}


- Src sourceElement = null;
- Dst destinationElement = null;
+ Src sourceElement;
+ Dst destinationElement;

Subject subject = (Subject) metadata.getSubject();
if (subject != null) {

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:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -73,7 +73,7 @@
throws PerfSONARException {


- Metadata metadata = null;
+ Metadata metadata;
try {
Metadata[] metadataArray = (query.getMetadataArray());
metadata = metadataArray[0];
@@ -268,7 +268,7 @@



- String node1 = null;
+ String node1;
if (node1Name.isEmpty() && node1Country.isEmpty() &&
node1City.isEmpty() && node1Institution.isEmpty())
node1 = " let $node1_metadata := '' \n"
+ " let $node1_id := '' ";
@@ -289,7 +289,7 @@
+ " ''
\n";


- String node2 = null;
+ String node2;
if (node2Name.isEmpty() && node2Country.isEmpty() &&
node2City.isEmpty() && node2Institution.isEmpty())
node2 = " let $node2_metadata := '' \n"
+ " let $node2_id := '' ";
@@ -370,7 +370,7 @@
try { nodeInstitution =
nodeArray[0].getInstitutionElement().getInstitution().trim(); } catch
(Exception ex) {
}

- String node = null;
+ String node;
if (nodeName.isEmpty() && nodeCountry.isEmpty() &&
nodeCity.isEmpty() && nodeInstitution.isEmpty())
node = " let $node_metadata := '' \n"
+ " let $node_id := '' ";

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:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -76,7 +76,7 @@
throws PerfSONARException{


- Metadata metadata = null;
+ Metadata metadata;
try {
Metadata[] metadataArray = (query.getMetadataArray());
metadata = metadataArray[0];
@@ -272,7 +272,7 @@



- String node1 = null;
+ String node1;
if (node1Name.isEmpty() && node1Country.isEmpty() &&
node1City.isEmpty() && node1Institution.isEmpty())
node1 = " let $node1_metadata := '' \n"
+ " let $node1_id := '' ";
@@ -293,7 +293,7 @@
+ " ''
\n";


- String node2 = null;
+ String node2;
if (node2Name.isEmpty() && node2Country.isEmpty() &&
node2City.isEmpty() && node2Institution.isEmpty())
node2 = " let $node2_metadata := '' \n"
+ " let $node2_id := '' ";
@@ -374,7 +374,7 @@
try { nodeInstitution =
nodeArray[0].getInstitutionElement().getInstitution().trim(); } catch
(Exception ex) {
}

- String node = null;
+ String node;
if (nodeName.isEmpty() && nodeCountry.isEmpty() &&
nodeCity.isEmpty() && nodeInstitution.isEmpty())
node = " let $node_metadata := '' \n"
+ " let $node_id := '' ";

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGeneratorFactory.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGeneratorFactory.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGeneratorFactory.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -69,7 +69,7 @@
+ eventTypeName);


- MetadataQueryGenerator metadataQueryGenerator = null;
+ MetadataQueryGenerator metadataQueryGenerator;

try {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -86,7 +86,7 @@
String dst = "";
String eventType = "";

- Metadata metadata = null;
+ Metadata metadata;
try {
Metadata[] metadataArray = (query.getMetadataArray());
metadata = metadataArray[0];

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -85,7 +85,7 @@
String dst = "";
String eventType = "";

- Metadata metadata = null;
+ Metadata metadata;
try {
Metadata[] metadataArray = (query.getMetadataArray());
metadata = metadataArray[0];

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -74,22 +74,22 @@
//logger.debug("UtilizationQueryGenerator.getMetadataQuery: "
// + "start getMetadataQuery");

- String eventType = null;
- String keyword = null;
+ String eventType;
+ String keyword;

- String ipAddress = null;
- String hostName = null;
- String ifName = null;
- String ifDescription = null;
- String ifAddress = null;
- String ifAddressType = null;
- String ifIndex = null;
- String type = null;
- String direction = null;
- String classOfService = null;
- String capacity = null;
+ String ipAddress;
+ String hostName;
+ String ifName;
+ String ifDescription;
+ String ifAddress;
+ String ifAddressType;
+ String ifIndex;
+ String type;
+ String direction;
+ String classOfService;
+ String capacity;

- Metadata metadata = null;
+ Metadata metadata;
try {
Metadata[] metadataArray = (query.getMetadataArray());
metadata = metadataArray[0];

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/register/LSRegistrationComponent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/register/LSRegistrationComponent.java
2012-09-11 07:41:44 UTC (rev 6003)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/register/LSRegistrationComponent.java
2012-09-11 07:41:46 UTC (rev 6004)
@@ -96,7 +96,7 @@
+ LSRegistrationComponent.MA_CONFIG_STORE);
}

- ServiceLSRegistrator registrator = null;
+ ServiceLSRegistrator registrator;

if (metadataConfigStore.trim().equals("file")) {

---

• [pS-dev] [GEANT/SA2/ps-java-services] r6004 - 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/fetch perfsonar-java-sql-ma/src/main/java/org/perf sonar/service/measurementArchive/sqlType/store perfsonar-j ava-sql-ma/src/test/java/org/perfsonar/service/measurement Archive/sqlType perfsonar_base/src/main/java/org/perfson ar/base/auxiliary perfsonar_base/src/main/java/org/perfs onar/base/auxiliary/components/authn perfsonar_base/src/ main/java/org/perfsonar/base/auxiliary/components/authn/ws sec perfsonar_base/src/main/java/org/perfsonar/base/auxi liary/components/mapping perfsonar_base/src/main/java/or g/perfsonar/base/auxiliary/components/scheduler perfsonar _base/src/main/java/org/perfsonar/base/auxiliary/compone nts/scheduler/actions perfsonar_base/src/main/java/org/p erfsonar/base/nmwg/owamp perfsonar_base/src/main/java/or g/perfsonar/base/util perfsonar_bas e/src/main/java/org/ perfsonar/base/util/iptrie perfsonar_base/src/main/java/ org/perfsonar/client/axis perfsonar_base/src/main/java/o rg/perfsonar/client/base/authn perfsonar_base/src/main/j ava/org/perfsonar/client/testHarness perfsonar_base/src/ main/java/org/perfsonar/service/base/authn perfsonar_bas e/src/main/java/org/perfsonar/service/base/engine perfsona r_base/src/main/java/org/perfsonar/service/base/messages perfsonar_base/src/main/java/org/perfsonar/service/base /storage/xmldb/exist perfsonar_base/src/main/java/org/pe rfsonar/service/base/storage/xmldb/exist/rest perfsonar_ base/src/main/java/org/perfsonar/service/base/storage/xmld b/exist/xmlrpc perfsonar_base/src/main/java/org/perfsona r/service/base/storage/xmlfile perfsonar_base/src/main/j ava/org/perfsonar/service/base/util perfsonar_base/src/m ain/java/org/perfsonar/service/base/web perfsonar_base/s rc/main/java/org/perfsonar/service/measurementArchive/meta dataConfig perfsonar_base/src/main/java/org/perfsonar/se rvice/measu rementArchive/metadataConfig/keyGenerator perf sonar_base/src/main/java/org/perfsonar/service/measureme ntArchive/metadataConfig/queryGenerator perfsonar_base/s rc/main/java/org/perfsonar/service/measurementArchive/regi ster, svn-noreply, 09/11/2012

---

Archive powered by MHonArc 2.6.16.