[libinline-java-perl] 357/398: ok

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag 0.55
in repository libinline-java-perl.

commit 4651853180b0dd34cf4366eeae296466f1199347
Author: patrick_leb <>
Date:   Thu Sep 29 01:00:34 2005 +0000

    ok
---
 Java.pm       | 4 ++--
 t/01_init.t   | 4 ++++
 t/09_usages.t | 9 +++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Java.pm b/Java.pm
index 34c8274..6878424 100644
--- a/Java.pm
+++ b/Java.pm
@@ -8,7 +8,7 @@ package Inline::Java ;
 use strict ;
 require 5.006 ;
 
-$Inline::Java::VERSION = '0.50_90' ;
+$Inline::Java::VERSION = '0.50_91' ;
 
 
 # DEBUG is set via the DEBUG config
@@ -486,7 +486,7 @@ sub load {
 		my $pc = new Inline::Java::Protocol(undef, $o) ;
 		$pc->AddClassPath(Inline::Java::Portable::portable("SUB_FIX_JAVA_PATH", Inline::Java::Portable::get_user_jar())) ;
 
-		my $st = $pc->ServerType() ;
+		my ($st, $file_enc, $sock_encs) = $pc->ServerType() ;
 		if ((($st eq "shared")&&(! $o->get_java_config('SHARED_JVM')))||
 			(($st eq "private")&&($o->get_java_config('SHARED_JVM')))){
 			croak "JVM type mismatch on port " . $JVM->{port} ;
diff --git a/t/01_init.t b/t/01_init.t
index b0b042d..d96a376 100644
--- a/t/01_init.t
+++ b/t/01_init.t
@@ -18,11 +18,15 @@ my $ij = $types1::INLINE ;
 $ij = $types1::INLINE ; # Stupid warning...
 my $jdk = $ij->get_java_config("J2SDK") ;
 my $ver = types1->version() ;
+
+my $pc = new Inline::Java::Protocol(undef, $ij) ;
+my ($st, $file_enc, $sock_encs) = $pc->ServerType() ;
 print STDERR "\nPerl version is $]\n" ;
 print STDERR "Inline version is $Inline::VERSION\n" ;
 print STDERR "Inline::Java version is $Inline::Java::VERSION\n" ;
 
 print STDERR "J2SDK version is $ver, from $jdk\n" ;
+print STDERR "Java encodings are file: $file_enc, stream: $sock_encs\n" ;
 print STDERR "CLASSPATH is $main::cp\n" ;
 
 if ($ENV{PERL_INLINE_JAVA_EMBEDDED_JNI}){
diff --git a/t/09_usages.t b/t/09_usages.t
index 18cb6b8..037285f 100755
--- a/t/09_usages.t
+++ b/t/09_usages.t
@@ -7,7 +7,7 @@ use Inline Config =>
 
 
 BEGIN {
-	plan(tests => 6) ;
+	plan(tests => 7) ;
 }
 
 
@@ -27,7 +27,7 @@ use Inline(
 		}
 	|,
 	NAME => 't09::p1',
-	EXTRA_JAVA_ARGS => '-Dprop1="a:"  -Dprop2=b',
+	EXTRA_JAVA_ARGS => '-Dprop1="c:\program files" -Dprop2=\'"\' -Dprop3=42',
 ) ;
 
 
@@ -61,8 +61,9 @@ my $t = new t09::p1::t09p1() ;
 
 {
 	ok($t->{name}, "p1") ;
-	ok($t->get_prop(1), 'a:') ;
-	ok($t->get_prop(2), 'b') ;
+	ok($t->get_prop(1), 'c:\program files') ;
+	ok($t->get_prop(2), '"') ;
+	ok($t->get_prop(3), 42) ;
 	ok($t09::p2::t09p2::name . $t09::p3::t09p3::name, "p2p3") ;
 	ok($t09::p2::t09p2::name . $t09::p3::t09p3::name, "p2p3") ;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libinline-java-perl.git