changeset 6843:ddd59bc77e60

Merge
author asaha
date Wed, 04 Sep 2013 08:30:47 -0700
parents fd6170becf78 995b32f013f5
children 30e41fbd2e24
files
diffstat 1 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	Tue Aug 27 15:36:49 2013 -0700
+++ b/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	Wed Sep 04 08:30:47 2013 -0700
@@ -29,6 +29,7 @@
 import java.beans.ExceptionListener;
 
 import java.io.IOException;
+import java.io.StringReader;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
@@ -246,6 +247,14 @@
     }
 
     /**
+     * Disables any external entities.
+     */
+    @Override
+    public InputSource resolveEntity(String publicId, String systemId) {
+        return new InputSource(new StringReader(""));
+    }
+
+    /**
      * Prepares this handler to read objects from XML document.
      */
     @Override