You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/03/02 06:56:32 UTC

svn commit: r749199 - /servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java

Author: ccustine
Date: Mon Mar  2 05:56:32 2009
New Revision: 749199

URL: http://svn.apache.org/viewvc?rev=749199&view=rev
Log:
SMX4KNL-215 - Don't attempt to stop fragments in filemonitor

Modified:
    servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java

Modified: servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java?rev=749199&r1=749198&r2=749199&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java (original)
+++ servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java Mon Mar  2 05:56:32 2009
@@ -397,7 +397,9 @@
         if (bundle == null) {
             LOGGER.warn("Could not find Bundle for file: " + file.getCanonicalPath());
         } else {
-            bundle.stop();
+            if (!isBundleFragment(bundle)) {
+                bundle.stop();
+            }
             bundle.uninstall();
         }
     }



Re: svn commit: r749199 - /servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java

Posted by Guillaume Nodet <gn...@gmail.com>.
Right, sorry I missed that.

On Mon, Mar 2, 2009 at 09:27, Chris Custine <ch...@gmail.com> wrote:

> That part was already being checked so we should be ok.
>
> Chris
>
> --
> Chris Custine
> My Blog :: http://blog.organicelement.com
> Apache ServiceMix :: http://servicemix.apache.org
> Apache Directory Server :: http://directory.apache.org
>
>
> On Mon, Mar 2, 2009 at 12:33 AM, Guillaume Nodet <gn...@gmail.com> wrote:
>
> > Should we also avoid starting bundle fragments from the FileMonitor ?
> >
> > On Mon, Mar 2, 2009 at 06:56,  <cc...@apache.org> wrote:
> > > Author: ccustine
> > > Date: Mon Mar  2 05:56:32 2009
> > > New Revision: 749199
> > >
> > > URL: http://svn.apache.org/viewvc?rev=749199&view=rev
> > > Log:
> > > SMX4KNL-215 - Don't attempt to stop fragments in filemonitor
> > >
> > > Modified:
> > >
> >
>  servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
> > >
> > > Modified:
> >
> servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
> > > URL:
> >
> http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java?rev=749199&r1=749198&r2=749199&view=diff
> > >
> >
> ==============================================================================
> > > ---
> >
> servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
> > (original)
> > > +++
> >
> servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
> > Mon Mar  2 05:56:32 2009
> > > @@ -397,7 +397,9 @@
> > >         if (bundle == null) {
> > >             LOGGER.warn("Could not find Bundle for file: " +
> > file.getCanonicalPath());
> > >         } else {
> > > -            bundle.stop();
> > > +            if (!isBundleFragment(bundle)) {
> > > +                bundle.stop();
> > > +            }
> > >             bundle.uninstall();
> > >         }
> > >     }
> > >
> > >
> > >
> >
> >
> >
> > --
> > Cheers,
> > Guillaume Nodet
> > ------------------------
> > Blog: http://gnodet.blogspot.com/
> > ------------------------
> > Open Source SOA
> > http://fusesource.com
> >
>



-- 
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com

Re: svn commit: r749199 - /servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java

Posted by Chris Custine <ch...@gmail.com>.
That part was already being checked so we should be ok.

Chris

--
Chris Custine
My Blog :: http://blog.organicelement.com
Apache ServiceMix :: http://servicemix.apache.org
Apache Directory Server :: http://directory.apache.org


On Mon, Mar 2, 2009 at 12:33 AM, Guillaume Nodet <gn...@gmail.com> wrote:

> Should we also avoid starting bundle fragments from the FileMonitor ?
>
> On Mon, Mar 2, 2009 at 06:56,  <cc...@apache.org> wrote:
> > Author: ccustine
> > Date: Mon Mar  2 05:56:32 2009
> > New Revision: 749199
> >
> > URL: http://svn.apache.org/viewvc?rev=749199&view=rev
> > Log:
> > SMX4KNL-215 - Don't attempt to stop fragments in filemonitor
> >
> > Modified:
> >
>  servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
> >
> > Modified:
> servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
> > URL:
> http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java?rev=749199&r1=749198&r2=749199&view=diff
> >
> ==============================================================================
> > ---
> servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
> (original)
> > +++
> servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
> Mon Mar  2 05:56:32 2009
> > @@ -397,7 +397,9 @@
> >         if (bundle == null) {
> >             LOGGER.warn("Could not find Bundle for file: " +
> file.getCanonicalPath());
> >         } else {
> > -            bundle.stop();
> > +            if (!isBundleFragment(bundle)) {
> > +                bundle.stop();
> > +            }
> >             bundle.uninstall();
> >         }
> >     }
> >
> >
> >
>
>
>
> --
> Cheers,
> Guillaume Nodet
> ------------------------
> Blog: http://gnodet.blogspot.com/
> ------------------------
> Open Source SOA
> http://fusesource.com
>

Re: svn commit: r749199 - /servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java

Posted by Guillaume Nodet <gn...@gmail.com>.
Should we also avoid starting bundle fragments from the FileMonitor ?

On Mon, Mar 2, 2009 at 06:56,  <cc...@apache.org> wrote:
> Author: ccustine
> Date: Mon Mar  2 05:56:32 2009
> New Revision: 749199
>
> URL: http://svn.apache.org/viewvc?rev=749199&view=rev
> Log:
> SMX4KNL-215 - Don't attempt to stop fragments in filemonitor
>
> Modified:
>    servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
>
> Modified: servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
> URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java?rev=749199&r1=749198&r2=749199&view=diff
> ==============================================================================
> --- servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java (original)
> +++ servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java Mon Mar  2 05:56:32 2009
> @@ -397,7 +397,9 @@
>         if (bundle == null) {
>             LOGGER.warn("Could not find Bundle for file: " + file.getCanonicalPath());
>         } else {
> -            bundle.stop();
> +            if (!isBundleFragment(bundle)) {
> +                bundle.stop();
> +            }
>             bundle.uninstall();
>         }
>     }
>
>
>



-- 
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com