jakarta-bsf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Rony G. Flatscher" <Rony.Flatsc...@wu-wien.ac.at>
Subject Re: svn commit: r331843 - /jakarta/bsf/trunk/src/org/apache/bsf/BSFManager.java
Date Mon, 14 Nov 2005 09:00:28 GMT
Hi Sanka,

just tried to get your changes into my local copy of bsf, but it seems 
that either your changes were not committed or rolled back.

Here you see my local, checked out copy, the local directory and the 
result of "svn stat" and "svn diff" indicating that my local copy would 
be the same as the one on apache.org. Also svn thinks the last time a 
change has occurred in this directory was on 2006-05-31:

----------------------- cut here --------------------
E:\svnrgf\remote\bsf\src\org\apache\bsf>svn info
Path: .
URL: https://svn.apache.org/repos/asf/jakarta/bsf/trunk/src/org/apache/bsf
Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
Revision: 189473
Node Kind: directory
Schedule: normal
Last Changed Author: sanka
Last Changed Rev: 180448
Last Changed Date: 2005-05-31 10:26:36 +0200 (Tue, 31 May 2005)


E:\svnrgf\remote\bsf\src\org\apache\bsf>dir
 Datenträger in Laufwerk E: ist root_e
 Volumeseriennummer: 97A2-EBE4

 Verzeichnis von E:\svnrgf\remote\bsf\src\org\apache\bsf

06/08/2005  12:43 AM    <DIR>          .
06/08/2005  12:43 AM    <DIR>          ..
06/08/2005  08:52 PM    <DIR>          .svn
06/14/2004  06:29 PM             3,209 BSFDeclaredBean.java
06/14/2004  06:29 PM            12,211 BSFEngine.java
06/14/2004  06:29 PM             4,155 BSFException.java
08/10/2004  04:25 AM            32,633 BSFManager.java
06/08/2005  12:41 AM    <DIR>          engines
06/08/2005  12:44 AM             1,729 Languages.properties
06/14/2004  06:29 PM             8,207 Main.java
06/08/2005  12:41 AM    <DIR>          test
06/11/2005  05:34 PM    <DIR>          util
               6 Datei(en)         62,144 Bytes
               6 Verzeichnis(se),  2,707,992,576 Bytes frei

E:\svnrgf\remote\bsf\src\org\apache\bsf>svn stat

E:\svnrgf\remote\bsf\src\org\apache\bsf>svn diff

E:\svnrgf\remote\bsf\src\org\apache\bsf>

----------------------- cut here --------------------


However, following the link of the generated change-message shows your 
changes:

sanka@apache.org wrote:

>Author: sanka
>Date: Tue Nov  8 08:59:46 2005
>New Revision: 331843
>
>URL: http://svn.apache.org/viewcvs?rev=331843&view=rev
>Log:
>Fixed: BSFManager.undeclareBean(..) undeclares wrong bean when bean to be undeclared not
found and vector of declared beans is not empty.
>
>Modified:
>    jakarta/bsf/trunk/src/org/apache/bsf/BSFManager.java
>
>Modified: jakarta/bsf/trunk/src/org/apache/bsf/BSFManager.java
>URL: http://svn.apache.org/viewcvs/jakarta/bsf/trunk/src/org/apache/bsf/BSFManager.java?rev=331843&r1=331842&r2=331843&view=diff
>==============================================================================
>--- jakarta/bsf/trunk/src/org/apache/bsf/BSFManager.java (original)
>+++ jakarta/bsf/trunk/src/org/apache/bsf/BSFManager.java Tue Nov  8 08:59:46 2005
>@@ -828,14 +828,16 @@
>         unregisterBean(beanName);
> 
>         BSFDeclaredBean tempBean = null;
>+        boolean found = false;
>         for (int i = 0; i < declaredBeans.size(); i++) {
>             tempBean = (BSFDeclaredBean) declaredBeans.elementAt(i);
>             if (tempBean.name.equals(beanName)) {
>+            	found = true;
>                 break;
>             }
>         }
> 
>-        if (tempBean != null) {
>+        if (found) {
>             declaredBeans.removeElement(tempBean);
> 
>             Enumeration enginesEnum = loadedEngines.elements();
>  
>
Would you have an idea what the reason for this could be, am I doing 
something wrong (not really used to svn)?

Regards,

---rony




---------------------------------------------------------------------
To unsubscribe, e-mail: bsf-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: bsf-dev-help@jakarta.apache.org


Mime
View raw message