Added checks for non-exisiting files in classpath converters. (#21)

Author: nedtwigg

.gitattributes

@@ -0,0 +1,3 @@
+* text eol=lf
+*.png binary
+*.jar binary

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-- oraclejdk8
+- openjdk8
 script: "./.ci/ci.sh"
 before_cache:
 - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

CHANGES.md

@@ -2,6 +2,9 @@
 
 ### Version 4.6.0-SNAPSHOT - TBD ([javadoc](http://diffplug.github.io/matconsolectl/javadoc/snapshot/), [jcenter](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/matsim/matconsolectl/))
 
+- Added checks for directories and non-exisiting files in classpath converters: In Configuration.getClassPathAsRMICodebase() and Configuration.getClassPathAsCanonicalPaths(). This prevents unnecessary IOExceptions for invalid classpaths.
+- https://github.com/diffplug/matconsolectl/pull/21
+
 ### Version 4.5.0 - July 18th 2017 ([javadoc](http://diffplug.github.io/matconsolectl/javadoc/4.5.0/), [jcenter](https://bintray.com/diffplug/opensource/matconsolectl/4.5.0/view))
 
 - Added `Builder.setOutputWriter` and `Builder.setErrorWriter` for capturing `stdout` and `stderr` from MATLAB. ([#20](https://github.com/diffplug/matconsolectl/pull/20))

src/matlabcontrol/Configuration.java

@@ -12,6 +12,7 @@
 import java.net.URL;
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
+import java.util.logging.Logger;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -23,12 +24,15 @@
  * @author <a href="mailto:nonother@gmail.com">Joshua Kaplan</a>
  */
 class Configuration {
+
+	private static Logger sLog = Logger.getLogger(Configuration.class.getName());
+
 	private Configuration() {}
 
 	/**
 	 * If running on OS X.
 	 * 
-	 * @return 
+	 * @return
 	 */
 	static boolean isOSX() {
 		return getOperatingSystem().startsWith("Mac OS X");
@@ -37,7 +41,7 @@ static boolean isOSX() {
 	/**
 	 * If running on Windows.
 	 * 
-	 * @return 
+	 * @return
 	 */
 	static boolean isWindows() {
 		return getOperatingSystem().startsWith("Windows");
@@ -55,7 +59,7 @@ static boolean isLinux() {
 	/**
 	 * Gets a string naming the operating system.
 	 * 
-	 * @return 
+	 * @return
 	 */
 	static String getOperatingSystem() {
 		return System.getProperty("os.name");
@@ -64,7 +68,7 @@ static String getOperatingSystem() {
 	/**
 	 * Returns the location or alias of MATLAB on an operating system specific basis.
 	 * <br><br>
-	 * For OS X this will be the location, for Windows or Linux this will be an alias. For any other operating system an 
+	 * For OS X this will be the location, for Windows or Linux this will be an alias. For any other operating system an
 	 * exception will be thrown.
 	 * 
 	 * @return
@@ -139,21 +143,26 @@ private static String getOSXMatlabLocation() throws MatlabConnectionException {
 	 * @throws MatlabConnectionException
 	 */
 	static String getClassPathAsRMICodebase() throws MatlabConnectionException {
+		String entry = "";
 		try {
 			StringBuilder codebaseBuilder = new StringBuilder();
 			String[] paths = System.getProperty("java.class.path", "").split(File.pathSeparator);
 
 			for (int i = 0; i < paths.length; i++) {
-				codebaseBuilder.append("file://");
-				codebaseBuilder.append(new File(paths[i]).getCanonicalFile().toURI().toURL().getPath());
-
+				File f = new File(paths[i]);
+				if (f.exists() && !f.isDirectory()) {
+					entry = new File(paths[i]).getCanonicalFile().toURI().toURL().getPath();
+					codebaseBuilder.append("file://");
+					codebaseBuilder.append(entry);
+				}
 				if (i != paths.length - 1) {
 					codebaseBuilder.append(" ");
 				}
 			}
 
 			return codebaseBuilder.toString();
 		} catch (IOException e) {
+			sLog.severe("Unable to resolve classpath entry: " + entry);
 			throw new MatlabConnectionException("Unable to resolve classpath entry", e);
 		}
 	}
@@ -162,14 +171,20 @@ static String getClassPathAsRMICodebase() throws MatlabConnectionException {
 	 * Converts the classpath into individual canonical entries.
 	 * 
 	 * @return
-	 * @throws MatlabConnectionException 
+	 * @throws MatlabConnectionException
 	 */
 	static String[] getClassPathAsCanonicalPaths() throws MatlabConnectionException {
 		try {
 			String[] paths = System.getProperty("java.class.path", "").split(File.pathSeparator);
 
 			for (int i = 0; i < paths.length; i++) {
-				paths[i] = new File(paths[i]).getCanonicalPath();
+				File f = new File(paths[i]);
+				if (f.exists()) {
+					paths[i] = f.getCanonicalPath();
+				} else {
+					sLog.severe("Classpath entry " + paths[i] + " not found. Adding absolute path instead.");
+					paths[i] = new File(paths[i]).getAbsolutePath();
+				}
 			}
 
 			return paths;
@@ -272,7 +287,7 @@ static String getSupportCodeLocation() throws MatlabConnectionException {
 	/**
 	 * Whether this code is running inside of MATLAB.
 	 * 
-	 * @return 
+	 * @return
 	 */
 	static boolean isRunningInsideMatlab() {
 		boolean available;