[libinline-java-perl] 235/398: 0.41

Jonas Smedegaard dr at jones.dk
Thu Feb 26 11:43:08 UTC 2015


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 b559141947899507ab2a845de5c6d7643b4eedbf
Author: patrick_leb <>
Date:   Mon Jul 14 17:42:16 2003 +0000

    0.41
---
 CHANGES               |  4 ++++
 Java.pm               |  4 +++-
 Java/Portable.pm      | 10 ++++++----
 Java/Protocol.pm      |  4 ++--
 README                |  4 ++++
 t/01_init.t           |  2 ++
 t/08_study.t          |  2 +-
 t/10_2_shared_start.t |  2 ++
 t/10_5_shared_fork.t  |  2 ++
 t/10_6_shared_sim.t   |  2 ++
 10 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 25dda70..98b0583 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 Revision history for Perl extension Inline::Java
 ------------------------------------------------
 
+0.41  Mon Jul 14 13:18:25 EDT 200
+    - Fixed CLASSPATH bug
+    - Possibly (!) fixed test suite problems under heavy load
+
 0.40  Fri Apr 11 11:00:00 EST 2003
     - Patch by Doug MacEachern to allow running under servlet engines.
     - Patch by John Kinsley for handling empty arrays.
diff --git a/Java.pm b/Java.pm
index 98f253c..253fb77 100644
--- a/Java.pm
+++ b/Java.pm
@@ -7,7 +7,7 @@ package Inline::Java ;
 
 use strict ;
 
-$Inline::Java::VERSION = '0.40' ;
+$Inline::Java::VERSION = '0.41' ;
 
 
 # DEBUG is set via the DEBUG config
@@ -315,6 +315,7 @@ sub build {
 			croak $o->compile_error_msg($cmd) ;
 		} ;
 		$ENV{CLASSPATH} = $cp ;
+		Inline::Java::debug(2, "classpath: $ENV{CLASSPATH}") ;
 
 		# When we run the commands, we quote them because in WIN32 you need it if
 		# the programs are in directories which contain spaces. Unfortunately, in
@@ -404,6 +405,7 @@ sub load {
 		Inline::Java::debug(2, "classpath: $ENV{CLASSPATH}") ;
 		$JVM = new Inline::Java::JVM($o) ;
 		$ENV{CLASSPATH}	= $cp ;
+		Inline::Java::debug(2, "classpath: $ENV{CLASSPATH}") ;
 
 		# Add CLASSPATH entries + user jar + $install_dir to the JVM classpath
 		my @cp = make_classpath($o->get_java_config('CLASSPATH'), get_user_jar()) ;
diff --git a/Java/Portable.pm b/Java/Portable.pm
index bf997ac..20f4dfd 100644
--- a/Java/Portable.pm
+++ b/Java/Portable.pm
@@ -58,10 +58,12 @@ sub make_classpath {
 	my @fcp = () ;
 	my %cp = map {$_ => 1} @cp ;
 	foreach my $p (@cp){
-		if (($p)&&($cp{$p})&&(-e $p)){
-			my $fp = (-d $p ? Cwd::abs_path($p) : $p) ;
-			push @fcp, portable("SUB_FIX_CLASSPATH", $fp) ;
-			delete $cp{$p} ;
+		if (($p)&&(-e $p)){
+			if ($cp{$p}){
+				my $fp = (-d $p ? Cwd::abs_path($p) : $p) ;
+				push @fcp, portable("SUB_FIX_CLASSPATH", $fp) ;
+				delete $cp{$p} ;
+			}
 		}
 		else{
 			Inline::Java::debug(2, "classpath candidate '$p' scraped") ;
diff --git a/Java/Protocol.pm b/Java/Protocol.pm
index 552acfa..6882160 100644
--- a/Java/Protocol.pm
+++ b/Java/Protocol.pm
@@ -29,13 +29,13 @@ sub AddClassPath {
 	@paths = map {
 		my $e = $_ ;
 		if ($CLASSPATH_ENTRIES{$e}){
-			return () ;
+			() ;
 		}
 		else{
 			Inline::Java::debug(2, "adding to classpath: '$e'") ;
 			$CLASSPATH_ENTRIES{$e} = 1 ;
+			$e ;
 		}
-		$e ;
 	} @paths ;
 
 	my $data = "add_classpath " . join(" ", map {encode($_)} @paths) ;
diff --git a/README b/README
index e7281f7..fd5797c 100644
--- a/README
+++ b/README
@@ -70,6 +70,10 @@ WARNING: THIS IS ALPHA SOFTWARE. It is incomplete and possibly unreliable.
          It is also possible that some elements of the interface (API) will 
          change in future releases.
 
+Inline::Java version 0.41 is a minor upgrade that includes:
++ Fixed CLASSPATH bug
++ Possibly (!) fixed test suite problems under heavy load
+
 Inline::Java version 0.40 is a major upgrade that includes:
 + Patch by Doug MacEachern to allow running under servlet engines.
 + Patch by John Kinsley for handling empty arrays.
diff --git a/t/01_init.t b/t/01_init.t
index 458d31f..d59babb 100644
--- a/t/01_init.t
+++ b/t/01_init.t
@@ -2,6 +2,7 @@ use strict ;
 use Test ;
 
 BEGIN {
+	$main::cp = $ENV{CLASSPATH} || "<empty>" ;
 	plan(tests => 1) ;
 	mkdir('./_Inline_test', 0777) unless -e './_Inline_test' ;
 }
@@ -20,6 +21,7 @@ my $ver = types1->version() ;
 print STDERR "\nInline 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 "CLASSPATH is $main::cp\n" ;
 
 if ($ENV{PERL_INLINE_JAVA_EMBEDDED_JNI}){
 	print STDERR "Using JNI extension (embedded).\n" ;
diff --git a/t/08_study.t b/t/08_study.t
index 11f0c22..8ef7211 100644
--- a/t/08_study.t
+++ b/t/08_study.t
@@ -23,7 +23,7 @@ use Inline(
 	AUTOSTUDY => 1,
 	STUDY => ['t.types'],
 	CLASSPATH => '.',
-) ;
+) ;				   
 
 
 package toto ;
diff --git a/t/10_2_shared_start.t b/t/10_2_shared_start.t
index 7b77ced..57e52ca 100755
--- a/t/10_2_shared_start.t
+++ b/t/10_2_shared_start.t
@@ -5,6 +5,8 @@ use Test ;
 
 
 BEGIN {
+	# Leave previous server enough time to die...
+	sleep(1) ;
 	require Inline::Java::Portable ;
 	if ($ENV{PERL_INLINE_JAVA_JNI}){
 		plan(tests => 0) ;
diff --git a/t/10_5_shared_fork.t b/t/10_5_shared_fork.t
index 9a27cab..86b732b 100755
--- a/t/10_5_shared_fork.t
+++ b/t/10_5_shared_fork.t
@@ -5,6 +5,8 @@ use Test ;
 
 
 BEGIN {
+	# Leave previous server enough time to die...
+	sleep(1) ;
 	require Inline::Java::Portable ;
 	if ($ENV{PERL_INLINE_JAVA_JNI}){
 		plan(tests => 0) ;
diff --git a/t/10_6_shared_sim.t b/t/10_6_shared_sim.t
index 3166008..108824a 100644
--- a/t/10_6_shared_sim.t
+++ b/t/10_6_shared_sim.t
@@ -9,6 +9,8 @@ use Inline Config =>
 
 
 BEGIN {
+	# Leave previous server enough time to die...
+	sleep(1) ;
 	if ($ENV{PERL_INLINE_JAVA_JNI}){
 		plan(tests => 0) ;
 		exit ;

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



More information about the Pkg-perl-cvs-commits mailing list