From afbdb640d5c4a68d2e84c0dd0bac61eeb03baac6 Mon Sep 17 00:00:00 2001
From: schlaepfer <schlaepfer@94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c>
Date: Mon, 23 Oct 2006 13:14:35 +0000
Subject: [PATCH] - set logger to final - log level check corrected (null
 pointer exception)

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@179 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
---
 java/src/ch/ntb/usb/Device.java         | 6 +++---
 java/src/ch/ntb/usb/USB.java            | 2 +-
 java/src/ch/ntb/usb/logger/LogUtil.java | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/java/src/ch/ntb/usb/Device.java b/java/src/ch/ntb/usb/Device.java
index c517323..db8ee0d 100644
--- a/java/src/ch/ntb/usb/Device.java
+++ b/java/src/ch/ntb/usb/Device.java
@@ -14,7 +14,7 @@ import ch.ntb.usb.logger.LogUtil;
  */
 public class Device {
 
-	private static Logger logger = LogUtil.getLogger("ch.ntb.usb");
+	private static final Logger logger = LogUtil.getLogger("ch.ntb.usb");
 
 	private static final int TIMEOUT_ERROR_CODE = -116;
 
@@ -225,7 +225,7 @@ public class Device {
 		}
 
 		logger.info("length written: " + lenWritten);
-		if (logger.getLevel().intValue() <= Level.FINEST.intValue()) {
+		if (logger.isLoggable(Level.FINEST)) {
 			StringBuffer sb = new StringBuffer("bulkwrite, ep 0x"
 					+ Integer.toHexString(out_ep_address) + ": " + lenWritten
 					+ " Bytes sent: ");
@@ -285,7 +285,7 @@ public class Device {
 		}
 
 		logger.info("length read: " + lenRead);
-		if (logger.getLevel().intValue() <= Level.FINEST.intValue()) {
+		if (logger.isLoggable(Level.FINEST)) {
 			StringBuffer sb = new StringBuffer("bulkread, ep 0x"
 					+ Integer.toHexString(in_ep_address) + ": " + lenRead
 					+ " Bytes received: ");
diff --git a/java/src/ch/ntb/usb/USB.java b/java/src/ch/ntb/usb/USB.java
index 1910486..0d3a4dc 100644
--- a/java/src/ch/ntb/usb/USB.java
+++ b/java/src/ch/ntb/usb/USB.java
@@ -26,7 +26,7 @@ public class USB {
 	 */
 	public static int FULLSPEED_MAX_BULK_PACKET_SIZE = 64;
 
-	private static Logger logger = LogUtil.getLogger("ch.ntb.usb");
+	private static final Logger logger = LogUtil.getLogger("ch.ntb.usb");
 
 	private static LinkedList<Device> devices = new LinkedList<Device>();
 
diff --git a/java/src/ch/ntb/usb/logger/LogUtil.java b/java/src/ch/ntb/usb/logger/LogUtil.java
index 148fceb..c8728dc 100644
--- a/java/src/ch/ntb/usb/logger/LogUtil.java
+++ b/java/src/ch/ntb/usb/logger/LogUtil.java
@@ -33,6 +33,7 @@ public class LogUtil {
 		Logger logger = manager.getLogger(name);
 		if (logger == null) {
 			logger = Logger.getLogger(name);
+			initLevel(logger, Level.OFF);
 			manager.addLogger(logger);
 		}
 		logger.setLevel(null);