[Ils-source] r1538 - in branches/1.6: . src/com/resolutions/ils/data webapp/WEB-INF/lib

[scribe at crosswire.org]

Author: scribe
Date: 2017-04-28 17:22:35 -0700 (Fri, 28 Apr 2017)
New Revision: 1538

Modified:
   branches/1.6/
   branches/1.6/src/com/resolutions/ils/data/CourseAttempt.java
   branches/1.6/webapp/WEB-INF/lib/ils.jar
Log:
Expanded catch of errors for checking for saved cert




Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1502,1504-1505,1507,1509-1510,1512,1514-1515,1518,1527,1529-1530,1532-1535
   + /trunk:796-1502,1504-1505,1507,1509-1510,1512,1514-1515,1518,1527,1529-1530,1532-1535,1537

Modified: branches/1.6/src/com/resolutions/ils/data/CourseAttempt.java
===================================================================
--- branches/1.6/src/com/resolutions/ils/data/CourseAttempt.java	2017-04-29 00:21:03 UTC (rev 1537)
+++ branches/1.6/src/com/resolutions/ils/data/CourseAttempt.java	2017-04-29 00:22:35 UTC (rev 1538)
@@ -806,10 +806,10 @@
 
 
 	public byte[] getSavedCertificate() {
-		Properties sysConfig = Utils.getSysConfig(null, getCompanyID());
-		String certsFolder = sysConfig.getProperty("certsFolder", "certs");
+		try {
+			Properties sysConfig = Utils.getSysConfig(null, getCompanyID());
+			String certsFolder = sysConfig.getProperty("certsFolder", "certs");
 logger.debug("certsFolder: " + certsFolder);
-		try {
 			File sysConfigPath = Utils.getSysConfigFile(null, getCompanyID());
 			File certs = new File(sysConfigPath.getParentFile().getParent(), certsFolder);
 	logger.debug("certsFolderPath: " + certs.getAbsolutePath());

Modified: branches/1.6/webapp/WEB-INF/lib/ils.jar
===================================================================
(Binary files differ)