Author: [log in to unmask]
Date: Tue Nov 25 16:32:13 2014
New Revision: 1591
Log:
Check for null detectorName argument in setDetector method.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Tue Nov 25 16:32:13 2014
@@ -16,7 +16,6 @@
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
-import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
@@ -243,6 +242,10 @@
@Override
public void setDetector(String detectorName, int runNumber) throws ConditionsNotFoundException {
+ if (detectorName == null) {
+ throw new IllegalArgumentException("The detectorName argument is null.");
+ }
+
logger.finest("setDetector detector " + detectorName + " and run #" + runNumber);
if (!isInitialized || !detectorName.equals(this.getDetector()) || runNumber != this.getRun()) {
