You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/25 17:21:58 UTC
[13/16] oodt git commit: OODT-906 remove unrequired assignment
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java b/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java
index a34741b..63970d5 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java
@@ -105,8 +105,8 @@ public final class RunDirJobSubmitter {
if (!in.ready())
throw new IOException();
- String line = null;
- String jobId = null;
+ String line;
+ String jobId;
while ((line = in.readLine()) != null) {
// overwrite the runDirName
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java
index f676838..f70a33c 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java
@@ -135,8 +135,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new implementation of a {@link QueueRepository}.
*/
public static QueueRepository getQueueRepositoryFromFactory(String queueRepositoryFactory) {
- Class clazz = null;
- QueueRepositoryFactory factory = null;
+ Class clazz;
+ QueueRepositoryFactory factory;
try {
clazz = Class.forName(queueRepositoryFactory);
@@ -171,8 +171,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new implementation of a {@link BackendRepository}.
*/
public static BackendRepository getBackendRepositoryFromFactory(String backendRepositoryFactory) {
- Class clazz = null;
- BackendRepositoryFactory factory = null;
+ Class clazz;
+ BackendRepositoryFactory factory;
try {
clazz = Class.forName(backendRepositoryFactory);
@@ -204,8 +204,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new implementation of a {@link NodeRepository}.
*/
public static NodeRepository getNodeRepositoryFromFactory(String nodeRepositoryFactory) {
- Class clazz = null;
- NodeRepositoryFactory factory = null;
+ Class clazz;
+ NodeRepositoryFactory factory;
try {
clazz = Class.forName(nodeRepositoryFactory);
@@ -241,8 +241,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new implementation of a {@link JobQueue}.
*/
public static JobQueue getJobQueueServiceFromFactory(String serviceFactory) {
- Class clazz = null;
- JobQueueFactory factory = null;
+ Class clazz;
+ JobQueueFactory factory;
try {
clazz = Class.forName(serviceFactory);
@@ -278,8 +278,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new {@link Batchmgr} implementation.
*/
public static Batchmgr getBatchmgrServiceFromFactory(String serviceFactory) {
- Class clazz = null;
- BatchmgrFactory factory = null;
+ Class clazz;
+ BatchmgrFactory factory;
try {
clazz = Class.forName(serviceFactory);
@@ -315,8 +315,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new {@link Monitor} implementation.
*/
public static Monitor getMonitorServiceFromFactory(String serviceFactory) {
- Class clazz = null;
- MonitorFactory factory = null;
+ Class clazz;
+ MonitorFactory factory;
try {
clazz = Class.forName(serviceFactory);
@@ -353,8 +353,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new {@link Scheduler} implementation.
*/
public static Scheduler getSchedulerServiceFromFactory(String serviceFactory) {
- Class clazz = null;
- SchedulerFactory factory = null;
+ Class clazz;
+ SchedulerFactory factory;
try {
clazz = Class.forName(serviceFactory);
@@ -388,8 +388,8 @@ public final class GenericResourceManagerObjectFactory {
* @return A new {@link JobRepository} from the given service factory.
*/
public static JobRepository getJobRepositoryFromServiceFactory(String serviceFactory) {
- Class clazz = null;
- JobRepositoryFactory factory = null;
+ Class clazz;
+ JobRepositoryFactory factory;
try {
clazz = Class.forName(serviceFactory);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
index 8cc8d65..1d96263 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
@@ -47,7 +47,7 @@ public final class JobBuilder {
}
public static JobSpec buildJobSpec(String jobFilePath) {
- Document doc = null;
+ Document doc;
try {
doc = XMLUtils.getDocumentRoot(new FileInputStream(new File(
jobFilePath)));
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java
index 10982da..adba1b1 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java
@@ -167,7 +167,7 @@ public final class Ulimit implements UlimitMetKeys {
}
public static Map getUlimitPropertiesMap() throws Exception {
- Process p = null;
+ Process p;
try {
p = Runtime.getRuntime().exec(
new String[] { shell, runShellCmdOption, ulimitCommand });
@@ -180,7 +180,7 @@ public final class Ulimit implements UlimitMetKeys {
BufferedReader in = new BufferedReader(new InputStreamReader(p
.getInputStream()));
- String line = null;
+ String line;
Map properties = new HashMap();
while ((line = in.readLine()) != null) {
@@ -198,7 +198,7 @@ public final class Ulimit implements UlimitMetKeys {
}
public static List getUlimitProperties() throws Exception {
- Process p = null;
+ Process p;
try {
p = Runtime.getRuntime().exec(
new String[] { shell, runShellCmdOption, ulimitCommand });
@@ -211,7 +211,7 @@ public final class Ulimit implements UlimitMetKeys {
BufferedReader in = new BufferedReader(new InputStreamReader(p
.getInputStream()));
- String line = null;
+ String line;
List properties = new Vector();
while ((line = in.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/test/java/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
----------------------------------------------------------------------
diff --git a/resource/src/test/java/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java b/resource/src/test/java/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
index cac41c9..147478b 100644
--- a/resource/src/test/java/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
+++ b/resource/src/test/java/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
@@ -140,7 +140,7 @@ public class TestJobStack extends TestCase {
public void testGetNextJob() {
JobStack stack = new JobStack(waitTime, repo);
- JobSpec nextJob = null;
+ JobSpec nextJob;
try {
stack.addJob(job1);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java b/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java
index bd8043a..4145556 100755
--- a/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java
@@ -61,7 +61,7 @@ public class OpenSSOImpl extends AbstractWebBasedSingleSignOn implements
// and pull the username from there
String ssoToken = this.getSSOToken();
if (ssoToken != null) {
- UserDetails details = null;
+ UserDetails details;
try {
details = this.ssoProxy.getUserAttributes(ssoToken);
} catch (Exception e) {
@@ -88,7 +88,7 @@ public class OpenSSOImpl extends AbstractWebBasedSingleSignOn implements
public boolean login(String username, String password) {
- String ssoToken = null;
+ String ssoToken;
try {
ssoToken = this.ssoProxy.authenticate(username, password);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOnFactory.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOnFactory.java b/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOnFactory.java
index bed2aae..dd6b892 100644
--- a/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOnFactory.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOnFactory.java
@@ -38,8 +38,8 @@ public final class SingleSignOnFactory {
@SuppressWarnings("unchecked")
public static AbstractWebBasedSingleSignOn getWebBasedSingleSignOn(String className) {
- AbstractWebBasedSingleSignOn sso = null;
- Class<AbstractWebBasedSingleSignOn> clazz = null;
+ AbstractWebBasedSingleSignOn sso;
+ Class<AbstractWebBasedSingleSignOn> clazz;
try {
clazz = (Class<AbstractWebBasedSingleSignOn>) Class.forName(className);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java b/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
index e4e0de3..6a47838 100755
--- a/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
@@ -87,7 +87,7 @@ public class SSOProxy implements SSOMetKeys {
public String authenticate(String username, String password) {
HttpClient httpClient = new HttpClient();
PostMethod post = new PostMethod(AUTH_ENDPOINT);
- String response = null;
+ String response;
String ssoToken = null;
NameValuePair[] data = { new NameValuePair("username", username),
@@ -186,7 +186,7 @@ public class SSOProxy implements SSOMetKeys {
while ((line = br.readLine()) != null) {
if (line.equals(IDENTITY_DETAILS_ATTR_SKIP_LINE))
continue;
- String key = null, val = null;
+ String key, val;
if (line.startsWith(IDENTITY_DETAILS_REALM)) {
// can't parse it the same way
key = line.substring(0, IDENTITY_DETAILS_REALM.length());
@@ -222,7 +222,6 @@ public class SSOProxy implements SSOMetKeys {
} catch (Exception ignore) {
}
- is = null;
}
if (br != null) {
@@ -231,7 +230,6 @@ public class SSOProxy implements SSOMetKeys {
} catch (Exception ignore) {
}
- br = null;
}
}
@@ -247,7 +245,7 @@ public class SSOProxy implements SSOMetKeys {
try {
while ((line = br.readLine()) != null) {
- String key = null, val = null;
+ String key, val;
if (line.startsWith(USER_DETAILS_ROLE)) {
// can't parse by splitting, parse by using substring
key = line.substring(0, USER_DETAILS_ROLE.length());
@@ -279,7 +277,6 @@ public class SSOProxy implements SSOMetKeys {
} catch (Exception ignore) {
}
- is = null;
}
if (br != null) {
@@ -288,7 +285,6 @@ public class SSOProxy implements SSOMetKeys {
} catch (Exception ignore) {
}
- br = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/types/TypeBrowser.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/types/TypeBrowser.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/types/TypeBrowser.java
index 3e902eb..0c33641 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/types/TypeBrowser.java
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/types/TypeBrowser.java
@@ -250,7 +250,7 @@ public class TypeBrowser extends Panel {
this.pageNum = this.productPage.getPageNum();
// get the last page
- ProductPage lastPage = null;
+ ProductPage lastPage;
Query query = new Query();
query.getCriteria().addAll(this.criteria);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
index 14e8910..0845375 100644
--- a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
+++ b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
@@ -53,7 +53,7 @@ class VisibilityAndSortToggler extends VisibilityToggler {
final ListModel model) {
super(id, showLinkId, hideLinkId, moreId, model);
- Link<Link> sortLink = null;
+ Link<Link> sortLink;
Link<Link> unsortLink = null;
sortLink = new Link<Link>(sortLinkId, new Model<Link>(unsortLink)) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
index 8a53976..62993cd 100644
--- a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
+++ b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
@@ -47,7 +47,7 @@ public class VisibilityToggler extends WebMarkupContainer {
String moreId, final ListModel model) {
super(id, model);
- Link<Link> showLink = null;
+ Link<Link> showLink;
Link<Link> hideLink = null;
final Vector allStatusList = (Vector) ((Vector) model.getObject()).clone();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
index 7de8e20..df13867 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
@@ -157,7 +157,6 @@ public class CASProductHandler implements LargeProductQueryHandler {
} catch (Exception ignore) {
}
- in = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
index d82f7ee..be68235 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
@@ -59,7 +59,7 @@ public class DataDeliveryServlet extends HttpServlet implements
public void init(ServletConfig config) throws ServletException {
super.init(config);
try {
- String fileMgrURL = null;
+ String fileMgrURL;
try {
fileMgrURL = PathUtils.replaceEnvVariables(config.getServletContext().getInitParameter(
"filemgr.url") );
@@ -157,8 +157,8 @@ public class DataDeliveryServlet extends HttpServlet implements
// we'll be delivering a zip
res.addHeader(CONTENT_TYPE_HDR, FORMAT_ZIP);
- String productZipFilePath = null;
- File productZipFile = null;
+ String productZipFilePath;
+ File productZipFile;
InputStream in = null;
OutputStream o2 = null;
@@ -202,7 +202,6 @@ public class DataDeliveryServlet extends HttpServlet implements
} catch (Exception ignore) {
}
- in = null;
}
if (o2 != null) {
@@ -211,10 +210,8 @@ public class DataDeliveryServlet extends HttpServlet implements
} catch (Exception ignore) {
}
- o2 = null;
}
- productZipFile = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
index 20148dc..3f0ee6f 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
@@ -127,7 +127,7 @@ public class DatasetDeliveryServlet extends HttpServlet implements
// for each product, zip it up
// after you zip up all products then create the dataset zip
- ProductPage page = null;
+ ProductPage page;
try {
page = client.getFirstPage(type);
@@ -144,7 +144,7 @@ public class DatasetDeliveryServlet extends HttpServlet implements
continue;
}
- Metadata metadata = null;
+ Metadata metadata;
product.setProductReferences(client.getProductReferences(product));
metadata = client.getMetadata(product);
DataUtils.createProductZipFile(product, metadata, productDirPath);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java
index 1db11dd..8244333 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java
@@ -193,7 +193,7 @@ public class RdfConfiguration
? keyNsMap.get(key) : defaultKeyNs;
// Create the element.
- Element element = null;
+ Element element;
if (resLinkMap.containsKey(key))
{
element = document.createElement(namespace + ":" + tagName);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java
index ee88739..9dc4c28 100755
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java
@@ -81,7 +81,7 @@ public class CasProductJaxrsServlet extends CXFNonSpringJaxrsServlet
{
try
{
- URL url = null;
+ URL url;
String urlParameter = context.getInitParameter("filemgr.url");
if (urlParameter != null)
{
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RdfWriter.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RdfWriter.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RdfWriter.java
index ad8b986..1db3ba7 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RdfWriter.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RdfWriter.java
@@ -59,7 +59,7 @@ public class RdfWriter
public String getBaseUri()
{
String baseUri = uriInfo.getBaseUri().toString();
- return baseUri += baseUri.endsWith("/") ? "" : "/";
+ return baseUri.endsWith("/") ? "" : "/";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RssWriter.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RssWriter.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RssWriter.java
index da449c4..70331fb 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RssWriter.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/writers/RssWriter.java
@@ -57,7 +57,7 @@ public abstract class RssWriter
public String getBaseUri()
{
String baseUri = uriInfo.getBaseUri().toString();
- return baseUri += baseUri.endsWith("/") ? "" : "/";
+ return baseUri.endsWith("/") ? "" : "/";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
index 5d69e85..7c237c1 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
@@ -100,7 +100,7 @@ public class RDFDatasetServlet extends HttpServlet {
throw new ServletException(e.getMessage());
}
- String fileManagerUrl = null;
+ String fileManagerUrl;
try {
fileManagerUrl = PathUtils.replaceEnvVariables(config.getServletContext().getInitParameter(
"filemgr.url") );
@@ -146,7 +146,7 @@ public class RDFDatasetServlet extends HttpServlet {
String productTypeName = req.getParameter("type");
String productTypeId = req.getParameter("typeID");
ProductTypeFilter filter = new ProductTypeFilter(req.getParameter("filter"));
- ProductType type = null;
+ ProductType type;
List<ProductType> productTypes = new Vector<ProductType>();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
index 1b3a53c..71e3307 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
@@ -105,7 +105,7 @@ public class RDFProductServlet extends HttpServlet {
throw new ServletException(e.getMessage());
}
- String fileManagerUrl = null;
+ String fileManagerUrl;
try {
fileManagerUrl = PathUtils.replaceEnvVariables(config.getServletContext().getInitParameter(
"filemgr.url") );
@@ -151,7 +151,7 @@ public class RDFProductServlet extends HttpServlet {
String productTypeId = req.getParameter("id");
ProductType type = null;
- List<Product> products = null;
+ List<Product> products;
try {
if (productTypeName.equals("ALL")) {
@@ -207,7 +207,7 @@ public class RDFProductServlet extends HttpServlet {
for (Product p : products) {
String productTypeIdStr = p.getProductType().getProductTypeId();
- ProductType productType = null;
+ ProductType productType;
if (type != null) {
productType = type;
@@ -287,7 +287,7 @@ public class RDFProductServlet extends HttpServlet {
if (types != null && types.size() > 0) {
products = new Vector<Product>();
for (ProductType type : types) {
- ProductPage page = null;
+ ProductPage page;
try {
page = fClient.getFirstPage(type);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
index 6598724..a8933ba 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
@@ -52,7 +52,7 @@ public final class RDFUtils {
// does this tag have a namespace? if not, use the default
String ns = conf.getKeyNs(key);
- Element elem = null;
+ Element elem;
// is this a resource link?
if (conf.getResLinkMap().containsKey(key)) {
elem = doc.createElement(ns + ":" + tagName);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
index 065d619..5237f6b 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
@@ -155,7 +155,7 @@ public class RSSProductServlet extends HttpServlet {
channelMet.addMetadata("TopN", String.valueOf(topN));
channelMet.addMetadata("BaseUrl", base);
- List products = null;
+ List products;
try {
if (productTypeName.equals("ALL")) {
@@ -184,7 +184,7 @@ public class RSSProductServlet extends HttpServlet {
}
if (products != null && products.size() > 0) {
- String channelDesc = null;
+ String channelDesc;
if (!productTypeName.equals("ALL")) {
channelDesc = type.getDescription();
@@ -227,7 +227,7 @@ public class RSSProductServlet extends HttpServlet {
Product p = (Product) product;
String productTypeIdStr = p.getProductType().getProductTypeId();
- ProductType productType = null;
+ ProductType productType;
try {
productType = fm.getProductTypeById(productTypeIdStr);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
index a516226..0cb1a5b 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
@@ -104,7 +104,7 @@ public class RSSProductTransferServlet extends HttpServlet {
public void init(ServletConfig config) throws ServletException {
super.init(config);
- String fileManagerUrl = null;
+ String fileManagerUrl;
try {
fileManagerUrl = PathUtils.replaceEnvVariables(config.getServletContext().getInitParameter(
"filemgr.url") );
@@ -154,7 +154,7 @@ public class RSSProductTransferServlet extends HttpServlet {
public void doIt(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, java.io.IOException {
- List currentTransfers = null;
+ List currentTransfers;
try {
currentTransfers = fClient.getCurrentFileTransfers();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/webapp/fmprod/src/test/java/org/apache/oodt/cas/product/data/TestDataUtils.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/test/java/org/apache/oodt/cas/product/data/TestDataUtils.java b/webapp/fmprod/src/test/java/org/apache/oodt/cas/product/data/TestDataUtils.java
index 0ae42d3..28f7f84 100644
--- a/webapp/fmprod/src/test/java/org/apache/oodt/cas/product/data/TestDataUtils.java
+++ b/webapp/fmprod/src/test/java/org/apache/oodt/cas/product/data/TestDataUtils.java
@@ -62,7 +62,7 @@ public class TestDataUtils extends TestCase {
Metadata metadata = new Metadata();
- String workingDirPath = null;
+ String workingDirPath;
workingDir = Files.createTempDir();
workingDirPath = workingDir.getAbsolutePath();
workingDir.deleteOnExit();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java
index 3abfb1f..6641526 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java
@@ -40,7 +40,7 @@ public class GetFirstPageCliAction extends WorkflowCliAction {
throws CmdLineActionException {
try {
XmlRpcWorkflowManagerClient client = getClient();
- WorkflowInstancePage page = null;
+ WorkflowInstancePage page;
if (status != null && !status.equals("")) {
page = client.paginateWorkflowInstances(1, status);
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java
index 252364b..389416e 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java
@@ -40,7 +40,7 @@ public class GetLastPageCliAction extends WorkflowCliAction {
throws CmdLineActionException {
try {
XmlRpcWorkflowManagerClient client = getClient();
- WorkflowInstancePage page = null;
+ WorkflowInstancePage page;
if (status != null && !status.equals("")) {
WorkflowInstancePage firstPage = client.paginateWorkflowInstances(
1, status);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java
index 09fc551..9c83eae 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java
@@ -46,7 +46,7 @@ public class GetNextPageCliAction extends WorkflowCliAction {
try {
XmlRpcWorkflowManagerClient client = getClient();
- WorkflowInstancePage page = null;
+ WorkflowInstancePage page;
if (status != null && !status.equals("")) {
page = client.paginateWorkflowInstances(pageNum + 1, status);
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java
index cbc0dd9..ab62165 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java
@@ -46,7 +46,7 @@ public class GetPrevPageCliAction extends WorkflowCliAction {
try {
XmlRpcWorkflowManagerClient client = getClient();
- WorkflowInstancePage page = null;
+ WorkflowInstancePage page;
if (status != null && !status.equals("")) {
page = client.paginateWorkflowInstances(pageNum - 1, status);
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
index 3776e01..2a8020f 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
@@ -501,7 +501,7 @@ public class IterativeWorkflowProcessorThread implements WorkflowStatus,
private boolean satisfied(List conditionList, String taskId) {
for (Object aConditionList : conditionList) {
WorkflowCondition c = (WorkflowCondition) aConditionList;
- WorkflowConditionInstance cInst = null;
+ WorkflowConditionInstance cInst;
// see if we've already cached this condition instance
if (CONDITION_CACHE.get(taskId) != null) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
index 78ef705..6b512f0 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
@@ -105,7 +105,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
long threadKeepAliveTime, boolean unlimitedQueue, URL resUrl) {
this.instRep = instRep;
- Channel c = null;
+ Channel c;
if (unlimitedQueue) {
c = new LinkedQueue();
} else {
@@ -363,7 +363,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
.getEndDateTimeIsoStr().equals("null")) ? safeDateConvert(inst
.getEndDateTimeIsoStr()) : new Date();
- Date workflowStartDateTime = null;
+ Date workflowStartDateTime;
if (inst.getStartDateTimeIsoStr() == null
|| (inst.getStartDateTimeIsoStr() != null && (inst
@@ -396,7 +396,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
.getCurrentTaskEndDateTimeIsoStr().equals("null")) ? safeDateConvert(inst
.getCurrentTaskEndDateTimeIsoStr()) : new Date();
- Date workflowTaskStartDateTime = null;
+ Date workflowTaskStartDateTime;
if (inst.getCurrentTaskStartDateTimeIsoStr() == null
|| (inst.getCurrentTaskStartDateTimeIsoStr() != null && (inst
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
index 4cd8121..2b36b6b 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
@@ -72,7 +72,7 @@ public class WorkflowProcessorQueue {
* @return the list of available, Queued, {@link WorkflowProcessor}s.
*/
public synchronized List<WorkflowProcessor> getProcessors() {
- WorkflowInstancePage page = null;
+ WorkflowInstancePage page;
try {
page = repo.getPagedWorkflows(1);
} catch (Exception e) {
@@ -87,7 +87,7 @@ public class WorkflowProcessorQueue {
for (WorkflowInstance inst : (List<WorkflowInstance>) (List<?>) page
.getPageWorkflows()) {
if (!inst.getState().getCategory().getName().equals("done")) {
- WorkflowProcessor processor = null;
+ WorkflowProcessor processor;
try {
processor = fromWorkflowInstance(inst);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
index 595c43a..77d82ee 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
@@ -18,6 +18,14 @@
package org.apache.oodt.cas.workflow.engine.runner;
//JDK imports
+import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
+import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
+import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
+import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
+import org.apache.oodt.cas.workflow.structs.WorkflowTask;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
+
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -27,13 +35,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
-import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
-import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
-import org.apache.oodt.cas.workflow.structs.WorkflowTask;
-import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
-import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
/**
* Runs a local version of a {@link TaskProcessor} asynchronously.
@@ -130,12 +131,11 @@ public class AsynchronousLocalEngineRunner extends AbstractEngineRunnerBase {
*/
@Override
public void shutdown() {
- for (Thread worker : this.workerMap.values()) {
+ for (Thread worker : this.workerMap.values())
if (worker != null) {
worker.interrupt();
worker = null;
}
- }
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
index 42aa7a7..8af329f 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
@@ -54,7 +54,7 @@ public class BranchRedirector implements WorkflowTaskInstance {
@Override
public void run(Metadata metadata, WorkflowTaskConfiguration config)
throws WorkflowTaskInstanceException {
- XmlRpcWorkflowManagerClient wm = null;
+ XmlRpcWorkflowManagerClient wm;
try {
wm = new XmlRpcWorkflowManagerClient(new URL(
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
index 06ac404..d8b62db 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
@@ -748,7 +748,7 @@ public class DataSourceWorkflowInstanceRepository extends
// must call next first, or else no relative cursor
if (rs.next()) {
// grab the first one
- int numGrabbed = -1;
+ int numGrabbed;
if(pageNum == 1){
numGrabbed = 1;
wInstIds.add(rs.getString("workflow_instance_id"));
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java
index e428bc6..f814922 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java
@@ -61,7 +61,7 @@ public class DataSourceWorkflowInstanceRepositoryFactory implements
* </p>
*/
public DataSourceWorkflowInstanceRepositoryFactory() throws Exception {
- String jdbcUrl = null, user = null, pass = null, driver = null;
+ String jdbcUrl, user, pass, driver;
jdbcUrl = PathUtils
.replaceEnvVariables(System
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
index 2d5f377..d42c5e3 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
@@ -118,7 +118,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -156,7 +155,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -238,7 +236,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -283,7 +280,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -329,7 +325,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -400,7 +395,6 @@ public class LuceneWorkflowInstanceRepository extends
searcher.close();
} catch (Exception ignore) {
}
- searcher = null;
}
}
@@ -432,7 +426,6 @@ public class LuceneWorkflowInstanceRepository extends
} catch (Exception ignore) {
}
- reader = null;
}
}
@@ -444,7 +437,7 @@ public class LuceneWorkflowInstanceRepository extends
File indexDir = new File(idxFilePath);
- boolean createIndex = false;
+ boolean createIndex;
createIndex = !(indexDir.exists() && indexDir.isDirectory());
@@ -466,7 +459,6 @@ public class LuceneWorkflowInstanceRepository extends
writer.close();
} catch (Exception ignore) {
}
- writer = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java
index 9b71b7b..8f1efe5 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java
@@ -106,12 +106,12 @@ public final class WorkflowInstanceMetadataReader implements
private static Document getDocumentRoot(String xmlFile) {
// open up the XML file
- DocumentBuilderFactory factory = null;
- DocumentBuilder parser = null;
- Document document = null;
- InputSource inputSource = null;
+ DocumentBuilderFactory factory;
+ DocumentBuilder parser;
+ Document document;
+ InputSource inputSource;
- InputStream xmlInputStream = null;
+ InputStream xmlInputStream;
try {
xmlInputStream = new File(xmlFile).toURL().openStream();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
index 8c6e4ae..e2c6a07 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
@@ -211,7 +211,7 @@ public class WorkflowLifecycleManager {
public int getLastCompletedStageNum(WorkflowInstance inst) {
int currStageNum = getStageNum(inst);
if(inst.getState().getCategory() == null){
- WorkflowLifecycleStage category = null;
+ WorkflowLifecycleStage category;
if((category = getStage(inst)) != null){
inst.getState().setCategory(category);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java
index e9e34df..22fc39a 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java
@@ -155,12 +155,12 @@ public final class WorkflowLifecyclesReader implements WorkflowLifecycleMetKeys
private static Document getDocumentRoot(String xmlFile) {
// open up the XML file
- DocumentBuilderFactory factory = null;
- DocumentBuilder parser = null;
- Document document = null;
- InputSource inputSource = null;
+ DocumentBuilderFactory factory;
+ DocumentBuilder parser;
+ Document document;
+ InputSource inputSource;
- InputStream xmlInputStream = null;
+ InputStream xmlInputStream;
try {
xmlInputStream = new File(xmlFile).toURL().openStream();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java
index 078a4ec..dea7dda 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java
@@ -50,7 +50,7 @@ public class DataSourceWorkflowRepositoryFactory implements
* </p>.
*/
public DataSourceWorkflowRepositoryFactory() throws Exception {
- String jdbcUrl = null, user = null, pass = null, driver = null;
+ String jdbcUrl, user, pass, driver;
jdbcUrl = System
.getProperty("org.apache.oodt.cas.workflow.repo.datasource.jdbc.url");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
index a93bb73..ea6db55 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
@@ -316,7 +316,7 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
workflow.setId(workflowId);
}
- ParentChildWorkflow pcw = null;
+ ParentChildWorkflow pcw;
if(workflow instanceof ParentChildWorkflow) {
pcw = (ParentChildWorkflow) workflow;
}
@@ -369,7 +369,7 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
this.globalConfGroups = new HashMap<String, Metadata>();
this.graphs = new Vector<Graph>();
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder parser = null;
+ DocumentBuilder parser;
try {
parser = factory.newDocumentBuilder();
@@ -597,7 +597,7 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
}
this.workflows.put(graph.getModelId(), workflow);
} else if (graph.getExecutionType().equals("condition")) {
- WorkflowCondition cond = null;
+ WorkflowCondition cond;
if (graph.getModelIdRef() != null && !graph.getModelIdRef().equals("")) {
cond = this.conditions.get(graph.getModelIdRef());
@@ -639,7 +639,7 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
// is null and it's a condition definition, just add it
} else if (graph.getExecutionType().equals("task")) {
- WorkflowTask task = null;
+ WorkflowTask task;
if (graph.getModelIdRef() != null && !graph.getModelIdRef().equals("")) {
LOG.log(Level.FINER, "Model ID-Ref to: [" + graph.getModelIdRef() + "]");
task = this.tasks.get(graph.getModelIdRef());
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
index 71d9a94..6456887 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
@@ -348,7 +348,7 @@ public class XMLWorkflowRepository implements WorkflowRepository {
*/
public static void main(String[] args) throws RepositoryException {
String usage = "XmlWorkflowRepository <uri 1>...<uri n>\n";
- List uris = null;
+ List uris;
if (args.length == 0) {
System.err.println(usage);
@@ -534,7 +534,6 @@ public class XMLWorkflowRepository implements WorkflowRepository {
String workflowDirStr = workflowDir.getAbsolutePath();
if (!workflowDirStr.endsWith("/")) {
- workflowDirStr += "/";
}
// get all the workflow xml files
@@ -614,7 +613,7 @@ public class XMLWorkflowRepository implements WorkflowRepository {
String eventName = eventElem
.getAttribute("name");
- Workflow w = null;
+ Workflow w;
NodeList workflowNodeList = eventElem
.getElementsByTagName("workflow");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java
index 7fa9be3..53fe62c 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java
@@ -72,7 +72,7 @@ public class HighestFIFOPrioritySorter implements PrioritySorter {
}
private Double calculatePriority(WorkflowProcessor processorStub) {
- double aliveTime = 0.0;
+ double aliveTime;
try {
aliveTime = (double) (System.currentTimeMillis() - processorStub
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
index f0c46bd..8fdd95a 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
@@ -141,7 +141,7 @@ public class XmlRpcWorkflowManager {
public Vector getRegisteredEvents() throws RepositoryException {
- List events = null;
+ List events;
Vector eventsVector = new Vector();
try {
@@ -253,7 +253,7 @@ public class XmlRpcWorkflowManager {
public Vector getWorkflowsByEvent(String eventName)
throws RepositoryException {
- List workflows = null;
+ List workflows;
Vector workflowList = new Vector();
try {
@@ -282,7 +282,7 @@ public class XmlRpcWorkflowManager {
throws RepositoryException, EngineException {
LOG.log(Level.INFO, "WorkflowManager: Received event: " + eventName);
- List workflows = null;
+ List workflows;
try {
workflows = repo.getWorkflowsForEvent(eventName);
@@ -318,7 +318,7 @@ public class XmlRpcWorkflowManager {
}
public Hashtable getWorkflowInstanceById(String wInstId) {
- WorkflowInstance inst = null;
+ WorkflowInstance inst;
try {
inst = engine.getInstanceRepository().getWorkflowInstanceById(
@@ -369,7 +369,7 @@ public class XmlRpcWorkflowManager {
public Vector getWorkflowInstancesByStatus(String status)
throws EngineException {
- List workflowInsts = null;
+ List workflowInsts;
Vector workflowInstances = new Vector();
@@ -421,7 +421,7 @@ public class XmlRpcWorkflowManager {
}
public Vector getWorkflowInstances() throws EngineException {
- List workflowInsts = null;
+ List workflowInsts;
Vector workflowInstances = new Vector();
@@ -556,7 +556,7 @@ public class XmlRpcWorkflowManager {
public synchronized boolean setWorkflowInstanceCurrentTaskStartDateTime(
String wInstId, String startDateTimeIsoStr) {
- WorkflowInstance wInst = null;
+ WorkflowInstance wInst;
try {
wInst = this.engine.getInstanceRepository()
.getWorkflowInstanceById(wInstId);
@@ -570,7 +570,7 @@ public class XmlRpcWorkflowManager {
public synchronized boolean setWorkflowInstanceCurrentTaskEndDateTime(
String wInstId, String endDateTimeIsoStr) {
- WorkflowInstance wInst = null;
+ WorkflowInstance wInst;
try {
wInst = this.engine.getInstanceRepository()
.getWorkflowInstanceById(wInstId);
@@ -584,7 +584,7 @@ public class XmlRpcWorkflowManager {
public synchronized boolean updateWorkflowInstanceStatus(
String workflowInstanceId, String status) throws Exception {
- WorkflowInstance wInst = null;
+ WorkflowInstance wInst;
try {
wInst = engine.getInstanceRepository().getWorkflowInstanceById(
workflowInstanceId);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
index a7b1e40..1d54673 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
@@ -94,7 +94,7 @@ public class XmlRpcWorkflowManagerClient {
Vector argList = new Vector();
Vector<String> taskIdVector = new Vector<String>();
taskIdVector.addAll(taskIds);
- String instId = null;
+ String instId;
argList.add(taskIdVector);
argList.add(metadata.getHashtable());
@@ -129,7 +129,7 @@ public class XmlRpcWorkflowManagerClient {
public WorkflowInstancePage getFirstPage() throws Exception {
Vector argList = new Vector();
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute("workflowmgr.getFirstPage",
@@ -149,7 +149,7 @@ public class XmlRpcWorkflowManagerClient {
Vector argList = new Vector();
argList.add(XmlRpcStructFactory
.getXmlRpcWorkflowInstancePage(currentPage));
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute("workflowmgr.getNextPage",
@@ -169,7 +169,7 @@ public class XmlRpcWorkflowManagerClient {
Vector argList = new Vector();
argList.add(XmlRpcStructFactory
.getXmlRpcWorkflowInstancePage(currentPage));
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute("workflowmgr.getPrevPage",
@@ -186,7 +186,7 @@ public class XmlRpcWorkflowManagerClient {
public WorkflowInstancePage getLastPage() throws Exception {
Vector argList = new Vector();
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute("workflowmgr.getLastPage",
@@ -206,7 +206,7 @@ public class XmlRpcWorkflowManagerClient {
Vector argList = new Vector();
argList.add(pageNum);
argList.add(status);
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute(
@@ -225,7 +225,7 @@ public class XmlRpcWorkflowManagerClient {
throws Exception {
Vector argList = new Vector();
argList.add(pageNum);
- Hashtable pageHash = null;
+ Hashtable pageHash;
try {
pageHash = (Hashtable) client.execute(
@@ -242,7 +242,7 @@ public class XmlRpcWorkflowManagerClient {
public List getWorkflowsByEvent(String eventName) throws Exception {
List workflows = new Vector();
- Vector workflowVector = new Vector();
+ Vector workflowVector;
Vector argList = new Vector();
argList.add(eventName);
@@ -271,7 +271,7 @@ public class XmlRpcWorkflowManagerClient {
public Metadata getWorkflowInstanceMetadata(String wInstId) throws Exception {
Vector argList = new Vector();
argList.add(wInstId);
- Metadata met = null;
+ Metadata met;
try {
Hashtable instMetHash = (Hashtable) client.execute(
@@ -550,8 +550,8 @@ public class XmlRpcWorkflowManagerClient {
public Vector getWorkflows() throws Exception {
Vector argList = new Vector();
- Vector works = null;
- Vector workflows = null;
+ Vector works;
+ Vector workflows;
try {
works = (Vector) client
@@ -583,7 +583,7 @@ public class XmlRpcWorkflowManagerClient {
public int getNumWorkflowInstancesByStatus(String status) throws Exception{
Vector argList = new Vector();
argList.add(status);
- int numInsts = -1;
+ int numInsts;
try {
numInsts = (Integer) client.execute(
@@ -601,7 +601,7 @@ public class XmlRpcWorkflowManagerClient {
public int getNumWorkflowInstances() throws Exception{
Vector argList = new Vector();
- int numInsts = -1;
+ int numInsts;
try {
numInsts = (Integer) client.execute(
@@ -620,8 +620,8 @@ public class XmlRpcWorkflowManagerClient {
public Vector getWorkflowInstancesByStatus(String status) throws Exception {
Vector argList = new Vector();
argList.add(status);
- Vector insts = null;
- Vector instsUnpacked = null;
+ Vector insts;
+ Vector instsUnpacked;
try {
insts = (Vector) client.execute(
@@ -649,8 +649,8 @@ public class XmlRpcWorkflowManagerClient {
public Vector getWorkflowInstances() throws Exception {
Vector argList = new Vector();
- Vector insts = null;
- Vector instsUnpacked = null;
+ Vector insts;
+ Vector instsUnpacked;
try {
insts = (Vector) client.execute("workflowmgr.getWorkflowInstances",
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
index 03779ec..be77073 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
@@ -77,7 +77,7 @@ public class InstanceRepoCleaner {
System.exit(1);
}
- InstanceRepoCleaner clean = null;
+ InstanceRepoCleaner clean;
if (args.length == 1) {
String wmUrlStr = args[0];
clean = new InstanceRepoCleaner(wmUrlStr);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/util/CygwinScriptFile.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/CygwinScriptFile.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/CygwinScriptFile.java
index 78df722..038a12a 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/CygwinScriptFile.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/CygwinScriptFile.java
@@ -69,7 +69,6 @@ public class CygwinScriptFile extends ScriptFile {
} finally {
try {
pw.close();
- pw = null;
} catch (Exception ignore) {
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
index bcc61f7..c86cd40 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
@@ -120,8 +120,8 @@ public final class GenericWorkflowObjectFactory {
public static WorkflowInstanceRepository getWorkflowInstanceRepositoryFromClassName(
String serviceFactory) {
- WorkflowInstanceRepositoryFactory factory = null;
- Class clazz = null;
+ WorkflowInstanceRepositoryFactory factory;
+ Class clazz;
try {
clazz = Class.forName(serviceFactory);
@@ -163,7 +163,7 @@ public final class GenericWorkflowObjectFactory {
public static WorkflowTaskInstance getTaskObjectFromClassName(String className) {
if (className != null) {
- WorkflowTaskInstance taskInstance = null;
+ WorkflowTaskInstance taskInstance;
try {
Class workflowTaskClass = Class.forName(className);
@@ -209,7 +209,7 @@ public final class GenericWorkflowObjectFactory {
public static WorkflowTaskInstance getTaskObjectFromInnerClassName(Class<?> enclosingInstance, String className) {
if (className != null) {
- WorkflowTaskInstance taskInstance = null;
+ WorkflowTaskInstance taskInstance;
try {
Class workflowTaskClass = Class.forName(className);
@@ -269,7 +269,7 @@ public final class GenericWorkflowObjectFactory {
public static WorkflowConditionInstance getConditionObjectFromClassName(
String className) {
if (className != null) {
- WorkflowConditionInstance conditionInstance = null;
+ WorkflowConditionInstance conditionInstance;
try {
Class workflowConditionClass = Class.forName(className);
@@ -312,7 +312,7 @@ public final class GenericWorkflowObjectFactory {
*/
public static Workflow getWorkflowObjectFromClassName(String className){
if (className != null) {
- Workflow workflow = null;
+ Workflow workflow;
try {
Class workflowClass = Class.forName(className);
@@ -393,7 +393,7 @@ public final class GenericWorkflowObjectFactory {
* @return A copy of the specified Workflow.
*/
public static Workflow copyWorkflow(Workflow w){
- Workflow newWorkflow = null;
+ Workflow newWorkflow;
newWorkflow = getWorkflowObjectFromClassName(w.getClass().getName());
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
index 1361f20..5b9f047 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
@@ -118,7 +118,6 @@ public class ScriptFile {
} finally {
try {
pw.close();
- pw = null;
} catch (Exception ignore) {
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
index b936617..e9de482 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
@@ -96,7 +96,7 @@ public class QuerierAndRunnerUtils {
}
private File getTmpPath() throws IOException{
- File testDir = null;
+ File testDir;
String parentPath = File.createTempFile("test", "txt").getParentFile().getAbsolutePath();
parentPath = parentPath.endsWith("/") ? parentPath:parentPath + "/";
String testJobDirPath = parentPath + "jobs";
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java
index 5d2c378..627f9db 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java
@@ -76,7 +76,6 @@ public class SimpleTester implements WorkflowTaskInstance {
pw.close();
} catch (Exception ignore) {
}
- pw = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
index 4e5ef23..cd32455 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
@@ -115,7 +115,6 @@ public class TestAsynchronousLocalEngineRunner extends TestCase {
} catch (Exception ignore) {
}
- br = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java
index fe5bc9f..eb6b8a2 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java
@@ -48,14 +48,14 @@ public class TestTaskQuerier extends TestCase {
public void testGetNext(){
FILOPrioritySorter prioritizer = new FILOPrioritySorter();
MockProcessorQueue processorQueue = new MockProcessorQueue();
- List<WorkflowProcessor> queued = null;
+ List<WorkflowProcessor> queued;
assertNotNull(queued = processorQueue.getProcessors());
assertEquals(3, queued.size());
processorQueue = new MockProcessorQueue();
TaskQuerier querier = new TaskQuerier(processorQueue, prioritizer, null, WAIT_SECS);
Thread querierThread = new Thread(querier);
querierThread.start();
- List<WorkflowProcessor> runnables = null;
+ List<WorkflowProcessor> runnables;
while ((runnables = querier.getRunnableProcessors()) != null &&
runnables.size() < 2) {
assertNotNull(runnables);
@@ -72,14 +72,14 @@ public class TestTaskQuerier extends TestCase {
public void testGetRunnableProcessors() {
FILOPrioritySorter prioritizer = new FILOPrioritySorter();
MockProcessorQueue processorQueue = new MockProcessorQueue();
- List<WorkflowProcessor> queued = null;
+ List<WorkflowProcessor> queued;
assertNotNull(queued = processorQueue.getProcessors());
assertEquals(3, queued.size());
processorQueue = new MockProcessorQueue();
TaskQuerier querier = new TaskQuerier(processorQueue, prioritizer, null, WAIT_SECS);
Thread querierThread = new Thread(querier);
querierThread.start();
- List<WorkflowProcessor> runnables = null;
+ List<WorkflowProcessor> runnables;
while ((runnables = querier.getRunnableProcessors()) != null &&
runnables.size() < 2) {
assertNotNull(runnables);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
index b5c6558..7056042 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
@@ -112,7 +112,7 @@ public class TestLuceneWorkflowInstanceRepository extends TestCase implements
// get a temp directory
File tempDir = null;
- File tempFile = null;
+ File tempFile;
try {
tempFile = File.createTempFile("foo", "bar");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java
index 163d1ab..368baee 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java
@@ -68,7 +68,7 @@ public class TestWorkflowDataSourceRepository extends TestCase {
// get a temp directory
File tempDir = null;
- File tempFile = null;
+ File tempFile;
try {
tempFile = File.createTempFile("foo", "bar");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
index 485d61a..0375d48 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
@@ -128,7 +128,7 @@ public class TestXmlRpcWorkflowManagerClient extends TestCase {
assertNotNull(WInst);
// get Metadata for the workflow instance
- Metadata met = null;
+ Metadata met;
met = WInst.getSharedContext();
assertNotNull(met);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
index 39cbcc7..9c0ac12 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
@@ -103,7 +103,6 @@ public class DBMSExecutor {
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -112,7 +111,6 @@ public class DBMSExecutor {
} catch (Exception ignore) {
}
- conn = null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
index a98c835..5b5e27a 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
@@ -55,7 +55,7 @@ public class HandlerQueryParser implements ParseConstants {
*/
public static Expression parse(Stack<QueryElement> queryStack, Mapping map) {
- QueryElement qe = null;
+ QueryElement qe;
if (!queryStack.empty()) {
qe = (QueryElement) queryStack.pop();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java b/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java
index bd32cac..f402b6a 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java
@@ -41,7 +41,7 @@ public final class GenericCDEObjectFactory {
}
public static MappingFunc getMappingFuncFromClassName(String className) {
- MappingFunc func = null;
+ MappingFunc func;
Class funcClazz;
try {
funcClazz = Class.forName(className);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlps/src/test/java/org/apache/oodt/xmlps/structs/TestCDEResultInputStream.java
----------------------------------------------------------------------
diff --git a/xmlps/src/test/java/org/apache/oodt/xmlps/structs/TestCDEResultInputStream.java b/xmlps/src/test/java/org/apache/oodt/xmlps/structs/TestCDEResultInputStream.java
index 49f040e..fd01cc5 100644
--- a/xmlps/src/test/java/org/apache/oodt/xmlps/structs/TestCDEResultInputStream.java
+++ b/xmlps/src/test/java/org/apache/oodt/xmlps/structs/TestCDEResultInputStream.java
@@ -98,9 +98,9 @@ public class TestCDEResultInputStream extends TestCase {
public void testReadCharArrayIntInt() {
byte[] buf = new byte[128];
- int n = 0;
- int length = 0;
- String expected = null;
+ int n;
+ int length;
+ String expected;
try {
expected = ID + FS + LAST;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
index 8e7cf7f..abc666b 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java
@@ -18,11 +18,17 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
-import java.util.*;
-
-import org.apache.oodt.commons.util.*;
-import org.w3c.dom.*;
+import org.apache.oodt.commons.util.Documentable;
+import org.apache.oodt.commons.util.XML;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
/** A single header.
*
@@ -170,7 +176,7 @@ public class Header implements Serializable, Cloneable, Documentable {
}
public Object clone() {
- Object rc = null;
+ Object rc;
try {
rc = super.clone();
} catch (CloneNotSupportedException cantHappen) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
index 8e4b90e..b5a2889 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
@@ -335,7 +335,7 @@ public class Result implements Serializable, Cloneable, Documentable {
}
public Object clone() {
- Object rc = null;
+ Object rc;
try {
rc = super.clone();
} catch (CloneNotSupportedException cantHappen) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
index 514b13a..365d5fd 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
@@ -561,10 +561,9 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
*/
private boolean isTokenEqual (String s1) {
String ts;
- boolean rc = false;
+ boolean rc;
- ts = previous_token;
- if (previous_token.compareTo("") == 0) {
+ if (previous_token.compareTo("") == 0) {
ts = getNextTokenFromStream ();
if (ts.compareTo("") == 0) {
rc = false;
@@ -593,7 +592,7 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
*/
private String getNextTokenFromStream () {
int c, c2;
- String rc = "";
+ String rc;
try {
switch (c=tokens.nextToken()) {
case StreamTokenizer.TT_EOF:
@@ -669,8 +668,8 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
int p1, p2, s1l;
String s2;
- p1 = 0; p2 = 0;
- s1l = s1.length();
+ p1 = 0;
+ s1l = s1.length();
s2 = "";
p2 = s1.indexOf(c, p1);
while (p2 >= 0) {