vhardy 2003/07/10 06:18:57
Modified: sources/org/apache/batik/bridge SVGImageElementBridge.java
Log:
Fixed regression on bridge/embedData
Revision Changes Path
1.57 +15 -10
xml-batik/sources/org/apache/batik/bridge/SVGImageElementBridge.java
Index: SVGImageElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGImageElementBridge.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- SVGImageElementBridge.java 10 Jul 2003 02:01:26 -0000 1.56
+++ SVGImageElementBridge.java 10 Jul 2003 13:18:57 -0000 1.57
@@ -153,7 +153,13 @@
pDocURL = new ParsedURL(docURL);
UserAgent userAgent = ctx.getUserAgent();
- userAgent.checkLoadExternalResource(purl, pDocURL);
+
+ try {
+ userAgent.checkLoadExternalResource(purl, pDocURL);
+ } catch (SecurityException ex) {
+ throw new BridgeException(e, ERR_URI_UNSECURE,
+ new Object[] {uriStr});
+ }
DocumentLoader loader = ctx.getDocumentLoader();
ImageTagRegistry reg = ImageTagRegistry.getRegistry();
@@ -172,9 +178,6 @@
}
} catch (BridgeException ex) {
throw ex;
- } catch (SecurityException ex) {
- throw new BridgeException(e, ERR_URI_UNSECURE,
- new Object[] {uriStr});
} catch (Exception ex) {
/* Nothing to do */
}
@@ -193,7 +196,13 @@
* it hides the mark/reset methods so only we get to
* use them.
*/
- ProtectedStream reference = openStream(purl);
+ ProtectedStream reference = null;
+ try {
+ reference = openStream(purl);
+ } catch (SecurityException ex) {
+ throw new BridgeException(e, ERR_URI_UNSECURE,
+ new Object[] {uriStr});
+ }
{
/**
@@ -215,8 +224,6 @@
reference.retry();
} catch (IOException ioe) {
// Couldn't reset stream so reopen it.
- System.err.println("Reopening");
- ioe.printStackTrace();
reference = openStream(purl);
}
@@ -240,8 +247,6 @@
reference.retry();
} catch (IOException ioe) {
// Couldn't reset stream so reopen it.
- System.err.println("Reopening");
- ioe.printStackTrace();
reference = openStream(purl);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
