Course Timetabling: Automatic Hierarchical Constraints

- fixed a null exception when there is a preference with NULL abbreviation (e.g., neutral)
UniTime · Apr 26, 2017 · 2cfa52c · 2cfa52c
1 parent afc8321
commit 2cfa52c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/JavaSource/org/unitime/timetable/solver/TimetableDatabaseLoader.java b/JavaSource/org/unitime/timetable/solver/TimetableDatabaseLoader.java
@@ -3606,7 +3606,7 @@ protected void postAutomaticHierarchicalConstraints(org.hibernate.Session hibSes
 					pref = p;
 					constraint = constraint.substring(p.getPrefProlog().length() + 1).trim();
 					break;
-				} else if (p.getPrefAbbv() != null && constraint.startsWith(p.getPrefAbbv().toLowerCase() + " ") || constraint.startsWith(p.getPrefAbbv().toLowerCase() + ":")) {
+				} else if (p.getPrefAbbv() != null && (constraint.startsWith(p.getPrefAbbv().toLowerCase() + " ") || constraint.startsWith(p.getPrefAbbv().toLowerCase() + ":"))) {
 					pref = p;
 					constraint = constraint.substring(p.getPrefAbbv().length() + 1).trim();
 					break;