View | Details | Raw Unified | Return to issue 40246
Collapse All | Expand All

(-)makefile.mk (-1 / +2 lines)
Lines 56-62 Link Here
56
	toolsrc/org/mozilla/javascript/tools/debugger/TreeTableModelAdapter.java \
56
	toolsrc/org/mozilla/javascript/tools/debugger/TreeTableModelAdapter.java \
57
	toolsrc/org/mozilla/javascript/tools/debugger/TreeTableModel.java
57
	toolsrc/org/mozilla/javascript/tools/debugger/TreeTableModel.java
58
58
59
PATCH_FILE_NAME=rhino1_5R4.patch
59
PATCH_FILES=rhino1_5R4.patch \
60
	other.patch
60
61
61
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
62
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
62
63
(-)rhino1_5R4.patch (-1 lines)
Lines 2685-2733 Link Here
2685
!     }
2685
!     }
2686
! }
2686
! }
2687
! 
2687
! 
2688
*** misc/rhino1_5R4/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	Tue Mar 22 13:20:49 2005
(-)- misc/build/rhino1_5R4/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java (+46 lines)
Added Link Here
1
*** misc/rhino1_5R4/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	Tue Mar 22 13:20:49 2005
2
--- misc/build/rhino1_5R4/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	Tue Jul  4 14:59:43 2006
3
***************
4
*** 36,41 ****
5
--- 36,42 ----
6
  package org.mozilla.javascript.tools.shell;
7
  
8
  import java.security.*;
9
+ import java.security.cert.Certificate;
10
  import java.net.MalformedURLException;
11
  import java.net.URL;
12
  import java.util.Hashtable;
13
***************
14
*** 124,130 ****
15
  
16
      public JavaPolicySecurity() {
17
          // To trigger error on jdk-1.1 with lazy load
18
!         new CodeSource(null, null);
19
      }
20
  
21
      protected void callProcessFileSecure(final Context cx,
22
--- 125,131 ----
23
  
24
      public JavaPolicySecurity() {
25
          // To trigger error on jdk-1.1 with lazy load
26
!         new CodeSource(null, (Certificate [])null);
27
      }
28
  
29
      protected void callProcessFileSecure(final Context cx,
30
***************
31
*** 167,173 ****
32
      }
33
  
34
      private ProtectionDomain getUrlDomain(URL url) {
35
!         CodeSource cs = new CodeSource(url, null);
36
          PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
37
          return new ProtectionDomain(cs, pc);
38
      }
39
--- 168,174 ----
40
      }
41
  
42
      private ProtectionDomain getUrlDomain(URL url) {
43
!         CodeSource cs = new CodeSource(url, (Certificate [])null);
44
          PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
45
          return new ProtectionDomain(cs, pc);
46
      }

Return to issue 40246