[Swig-cvs] SWIG/Lib/java java.swg,1.48,1.49

[William F. <wsf...@us...>]

Update of /cvsroot/swig/SWIG/Lib/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5514/Lib/java

Modified Files:
	java.swg 
Log Message:
Fix for directors - where a class returned by value

Index: java.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/java/java.swg,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** java.swg	6 Jan 2006 13:58:10 -0000	1.48
--- java.swg	6 Jan 2006 14:09:14 -0000	1.49
***************
*** 584,594 ****
     $1 = *argp; %}
  
! %typemap(directorout) SWIGTYPE ($1_ltype argp)
! %{ argp = *($&1_ltype)(void *)&$input; 
!    if (!argp) {
!      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type");
       return $null;
     }
!    $1 = argp; %}
  
  %typemap(out) SWIGTYPE 
--- 584,593 ----
     $1 = *argp; %}
  
! %typemap(directorout) SWIGTYPE
! %{ if (!$input) {
!      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Unexpected null return for type $1_type");
       return $null;
     }
!    $1 = *($&1_ltype)(void *)&$input; %}
  
  %typemap(out) SWIGTYPE