Logitusta ja nullcheck

code/moya-ear/pom.xml

@@ -56,6 +56,11 @@
 			<version>${moya.version}</version>
 			<version>${moya.version}</version>
 			<type>war</type>
 			<type>war</type>
 		</dependency>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-jdk14</artifactId>
+			<version>1.7.7</version>
+		</dependency>
 	</dependencies>
 	</dependencies>
 
 
 
 

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderNameContainer.java

@@ -62,20 +62,20 @@ public class ReaderNameContainer implements Serializable {
 	 *            to set, or null to clear all readers
 	 *            to set, or null to clear all readers
 	 */
 	 */
 	public void setReaderId(Integer readerId) {
 	public void setReaderId(Integer readerId) {
-		if (readerId == null)
+		if (readerId == null) {
 			clearReaders();
 			clearReaders();
+			return;
+		}
 
 
 		if (getReaders().isEmpty()) {
 		if (getReaders().isEmpty()) {
 			getReaders().add(readerId);
 			getReaders().add(readerId);
 		} else {
 		} else {
-			Integer replacedItem = getReaders().set(0, readerId);
-			logger.warn("Replaced item {} wit {}", readerId, replacedItem);
-
+			getReaders().set(0, readerId);
 		}
 		}
 	}
 	}
 
 
 	public void addReader(Integer readerId) {
 	public void addReader(Integer readerId) {
-		if (!getReaders().contains(readerId)) {
+		if (readerId != null && !getReaders().contains(readerId)) {
 			getReaders().add(readerId);
 			getReaders().add(readerId);
 		}
 		}
 	}
 	}