Get rid of useless initialization by null.

php-coder · php-coder · commit 2e23d8fa3f89 · 2010-07-31T23:58:21.000+07:00
All class members initialized to null by default.

No functional change.
diff --git a/src/ru/mystamps/db/SuspiciousActivities.java b/src/ru/mystamps/db/SuspiciousActivities.java
@@ -10,7 +10,7 @@
 import javax.sql.DataSource;
 
 public class SuspiciousActivities {
-	private DataSource ds = null;
+	private DataSource ds;
 	
 	private static final String logEventQuery =
 			"INSERT INTO `suspicious_activities` " +
@@ -24,8 +24,7 @@ public class SuspiciousActivities {
 	public SuspiciousActivities()
 		throws NamingException {
 		
-		Context env = null;
-		env = (Context)new InitialContext().lookup("java:comp/env");
+		Context env = (Context)new InitialContext().lookup("java:comp/env");
 		ds = (DataSource)env.lookup("jdbc/mystamps");
 	}
 	
diff --git a/src/ru/mystamps/db/Users.java b/src/ru/mystamps/db/Users.java
@@ -16,7 +16,7 @@
 
 public class Users {
 	private Logger log = Logger.getRootLogger();
-	private DataSource ds = null;
+	private DataSource ds;
 	
 	/**
 	 * @see add()
@@ -71,8 +71,7 @@ public class Users {
 	public Users()
 		throws NamingException {
 		
-		Context env = null;
-		env = (Context)new InitialContext().lookup("java:comp/env");
+		Context env = (Context)new InitialContext().lookup("java:comp/env");
 		ds = (DataSource)env.lookup("jdbc/mystamps");
 	}
 	
diff --git a/src/ru/mystamps/db/UsersActivation.java b/src/ru/mystamps/db/UsersActivation.java
@@ -14,7 +14,7 @@
 
 public class UsersActivation {
 	private Logger log = Logger.getRootLogger();
-	private DataSource ds = null;
+	private DataSource ds;
 	
 	/**
 	 * @see add()
@@ -44,8 +44,7 @@ public class UsersActivation {
 	public UsersActivation()
 		throws NamingException {
 		
-		Context env = null;
-		env = (Context)new InitialContext().lookup("java:comp/env");
+		Context env = (Context)new InitialContext().lookup("java:comp/env");
 		ds = (DataSource)env.lookup("jdbc/mystamps");
 	}
 	
diff --git a/src/ru/mystamps/site/beans/SuspiciousEventBean.java b/src/ru/mystamps/site/beans/SuspiciousEventBean.java
@@ -10,14 +10,14 @@
 
 public class SuspiciousEventBean {
 	
-	private String type = null;
-	private String page = null;
-	private String ip = null;
-	private String refererPage = null;
-	private String userAgent = null;
+	private String type;
+	private String page;
+	private String ip;
+	private String refererPage;
+	private String userAgent;
 	
 	private Logger log = Logger.getRootLogger();
-	private SuspiciousActivities act = null;
+	private SuspiciousActivities act;
 	
 	/**
 	 * @throws NamingException
diff --git a/src/ru/mystamps/site/beans/UserBean.java b/src/ru/mystamps/site/beans/UserBean.java
@@ -1,9 +1,9 @@
 package ru.mystamps.site.beans;
 
 public class UserBean {
-	private Long uid     = - 1L;
-	private String name  = null;
-	private String login = null;
+	private Long uid = - 1L;
+	private String name;
+	private String login;
 	
 	public void setUid(Long uid) {
 		this.uid = uid;
diff --git a/src/ru/mystamps/site/filters/MaintenanceFilter.java b/src/ru/mystamps/site/filters/MaintenanceFilter.java
@@ -14,8 +14,8 @@
 
 public class MaintenanceFilter implements Filter {
 	
-	private FilterConfig config = null;
-	private Logger log = null;
+	private FilterConfig config;
+	private Logger log;
 	private static final String MAINTENANCE_PAGE_URL = "/maintenance.jsf";
 	
 	@Override
