Index: src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
===================================================================
RCS file: /home/technology/org.aspectj/modules/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java,v
retrieving revision 1.156
diff -u -r1.156 Ajc150Tests.java
--- src/org/aspectj/systemtest/ajc150/Ajc150Tests.java	4 Dec 2005 13:54:20 -0000	1.156
+++ src/org/aspectj/systemtest/ajc150/Ajc150Tests.java	5 Dec 2005 15:05:13 -0000
@@ -793,6 +793,9 @@
 	  runTest("no NPE when inaccessible method is called within itd");
   }
   
+  public void testNoNPEWithOrPointcutAndMoreThanOneArgs_pr118149() {
+	  runTest("no NPE with or pointcut and more than one args");
+  }
   
   // helper methods.....
   
Index: src/org/aspectj/systemtest/ajc150/ajc150.xml
===================================================================
RCS file: /home/technology/org.aspectj/modules/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml,v
retrieving revision 1.237
diff -u -r1.237 ajc150.xml
--- src/org/aspectj/systemtest/ajc150/ajc150.xml	4 Dec 2005 13:54:20 -0000	1.237
+++ src/org/aspectj/systemtest/ajc150/ajc150.xml	5 Dec 2005 15:05:18 -0000
@@ -1276,6 +1276,10 @@
         <run class="foo.ITDWithACall"/>
     </ajc-test>
 
+	<ajc-test dir="bugs150" title="no NPE with or pointcut and more than one args">
+        <compile files="PR118149.aj"/>
+    </ajc-test>
+
     <!-- ============================================================================ -->
     <!-- ============================================================================ -->
     
Index: bugs150/PR118149.aj
===================================================================
RCS file: bugs150/PR118149.aj
diff -N bugs150/PR118149.aj
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ bugs150/PR118149.aj	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,23 @@
+public aspect PR118149 {
+
+	public pointcut pc1(String s)
+		: execution(* C.*()) && args(s) && if(s != null);
+	
+	public pointcut pc2(String s)
+		: execution(C.new(String,..)) 
+		&& args(s,..) && if(s != null);
+
+	public pointcut pcOR(String s) : pc1(s) || pc2(s);
+	
+	before(String s) : pcOR(s) {	
+	}
+	
+}
+
+
+class C {
+
+	public C(String s, boolean b) {		
+	}
+	
+}