Fixed resource loading.

Author: asfernandes

src/fbjava-impl/src/main/java/org/firebirdsql/fbjava/impl/BlobConnection.java

@@ -42,149 +42,83 @@
 final class BlobConnection extends URLConnection
 {
 	private static final Logger log = LoggerFactory.getLogger(BlobConnection.class);
+	private ByteArrayOutputStream bout;
 
-	public BlobConnection(URL url)
+	public BlobConnection(URL url) throws IOException
 	{
 		super(url);
+
+		connect();
 	}
 
 	@Override
 	public void connect() throws IOException
 	{
-	}
+		if (bout != null)
+			return;
 
-	@Override
-	public InputStream getInputStream() throws IOException
-	{
 		try
 		{
 			final DbClassLoader classLoader = (DbClassLoader) Thread.currentThread().getContextClassLoader();
 			final Connection conn = classLoader.getConnection();
-			final PreparedStatement stmt = conn.prepareStatement("select content from sqlj.read_jar(?)");
-			ResultSet rs = null;
 
-			try
+			try (PreparedStatement stmt = conn.prepareStatement("select content from sqlj.read_jar(?)"))
 			{
 				String urlStr = url.toString().substring(8);	// "fbjava:/"
 				stmt.setString(1, urlStr);
-				final ResultSet finalRs = rs = stmt.executeQuery();
 
-				if (rs.next())
+				try (ResultSet rs = stmt.executeQuery())
 				{
-					return new InputStream() {
-						private InputStream inner = finalRs.getBinaryStream(1);
-
-						@Override
-						public int read() throws IOException
-						{
-							return inner.read();
-						}
-
-						@Override
-						public int read(byte[] b, int off, int len) throws IOException
-						{
-							return inner.read(b, off, len);
-						}
-
-						@Override
-						public long skip(long n) throws IOException
-						{
-							return inner.skip(n);
-						}
-
-						@Override
-						public int available() throws IOException
-						{
-							return inner.available();
-						}
-
-						@Override
-						public void close() throws IOException
-						{
-							if (inner == null)
-								return;
-
-							try
-							{
-								inner.close();
-								try
-								{
-									finalRs.close();
-									stmt.close();
-								}
-								catch (SQLException e)
-								{
-									throw new IOException(e);
-								}
-							}
-							finally
-							{
-								inner = null;
-							}
-						}
-
-						@Override
-						public void mark(int readlimit)
-						{
-							inner.mark(readlimit);
-						}
-
-						@Override
-						public void reset() throws IOException
-						{
-							inner.reset();
-						}
+					if (rs.next())
+					{
+						InputStream in = rs.getBinaryStream(1);
+						bout = new ByteArrayOutputStream();
 
-						@Override
-						public boolean markSupported()
-						{
-							return inner.markSupported();
-						}
-					};
-				}
-				else
-				{
-					rs.close();
-					stmt.close();
+						byte[] buffer = new byte[8192];
+						int count;
 
-					try (PreparedStatement stmt2 = conn.prepareStatement("select child from sqlj.list_dir(?)"))
+						while ((count = in.read(buffer)) != -1)
+							bout.write(buffer, 0, count);
+					}
+					else
 					{
-						stmt2.setString(1, urlStr);
-
-						try (ResultSet rs2 = stmt2.executeQuery())
+						try (PreparedStatement stmt2 = conn.prepareStatement("select child from sqlj.list_dir(?)"))
 						{
-							if (rs2.next())
-							{
-								ByteArrayOutputStream out = new ByteArrayOutputStream();
-								PrintWriter writer = new PrintWriter(out);
+							stmt2.setString(1, urlStr);
 
-								do
+							try (ResultSet rs2 = stmt2.executeQuery())
+							{
+								if (rs2.next())
 								{
-									writer.println(rs2.getString(1));
-								} while (rs2.next());
+									bout = new ByteArrayOutputStream();
+									PrintWriter writer = new PrintWriter(bout);
 
-								writer.close();
+									do
+									{
+										writer.println(rs2.getString(1));
+									} while (rs2.next());
 
-								return new ByteArrayInputStream(out.toByteArray());
+									writer.flush();
+								}
 							}
 						}
-					}
 
-					throw new IOException(String.format("Resource '%s' has not been found on the database.", url));
+						throw new IOException(
+							String.format("Resource '%s' has not been found on the database.", url));
+					}
 				}
 			}
-			catch (SQLException e)
-			{
-				if (rs != null)
-					rs.close();
-				stmt.close();
-				throw e;
-			}
 		}
 		catch (SQLException e)
 		{
 			log.error("Error retrieving resource or class from the database", e);
 			throw new IOException(e);
 		}
 	}
+
+	@Override
+	public InputStream getInputStream() throws IOException
+	{
+		return new ByteArrayInputStream(bout.toByteArray());
+	}
 }

src/fbjava-impl/src/main/java/org/firebirdsql/fbjava/impl/DbClassLoader.java

@@ -42,19 +42,21 @@
  */
 final class DbClassLoader extends URLClassLoader
 {
+	private final URL contextUrl;
 	String databaseName;
 	private FBConnection connection;
 	CodeSource codeSource;
 	PermissionCollection codeSourcePermission = new Permissions();
 
-	DbClassLoader(String databaseName, URL[] urls, ClassLoader parent)
+	DbClassLoader(String databaseName, URL contextUrl, ClassLoader parent)
 		throws SQLException
 	{
-		super(urls, parent);
+		super(new URL[] {contextUrl}, parent);
 
+		this.contextUrl = contextUrl;
 		this.databaseName = databaseName;
 
-		codeSource = new CodeSource(urls[0], (Certificate[]) null);
+		codeSource = new CodeSource(contextUrl, (Certificate[]) null);
 
 		Properties properties = new Properties();
 		properties.setProperty("isc_dpb_no_db_triggers", "1");
@@ -97,4 +99,25 @@ public Connection getConnection()
 	{
 		return connection;
 	}
+
+	@Override
+	public URL getResource(String name)
+	{
+		URL url = super.getResource(name);
+
+		if (url == null)
+		{
+			try
+			{
+				url = new URL(contextUrl, name);
+				url.openConnection();
+			}
+			catch (Exception e)
+			{
+				url = null;
+			}
+		}
+
+		return url;
+	}
 }

src/fbjava-impl/src/main/java/org/firebirdsql/fbjava/impl/ExternalEngine.java

@@ -104,15 +104,15 @@ private static class SharedData
 
 		SharedData(String databaseName) throws SQLException, MalformedURLException
 		{
-			URL url = new URL(null, "fbjava:/", new URLStreamHandler() {
+			URL contextUrl = new URL(null, "fbjava:/", new URLStreamHandler() {
 				@Override
 				protected URLConnection openConnection(URL url) throws IOException
 				{
 					return new BlobConnection(url);
 				}
 			});
 
-			classLoader = new DbClassLoader(databaseName, new URL[] {url}, getClass().getClassLoader());
+			classLoader = new DbClassLoader(databaseName, contextUrl, getClass().getClassLoader());
 		}
 
 		void openAttachment(IStatus status, IExternalContext context)