Skip to content

Reloading the clojure namespace #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mehretaban wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Reloading the clojure namespace #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/clojure/osgi/internal/ClojureOSGi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static void require(Bundle aBundle, final String aName) {
try {
withBundle(aBundle, new RunnableWithException() {
public Object run() throws Exception {
REQUIRE.invoke(Symbol.intern(aName));
REQUIRE.invoke(Symbol.intern(aName), Keyword.intern("reload"));
return null;
}
});
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/clojure/osgi/internal/ExtenderTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import clojure.osgi.RunnableWithException;

public class ExtenderTracker extends BundleTracker {
private Set<Long> requireProcessed = new HashSet<Long>();
private Set<Long> active = new HashSet<Long>();
private ServiceTracker logTracker;
private LogService log = new StreamLog(System.out);
Expand Down Expand Up @@ -49,14 +48,12 @@ public void removedService(ServiceReference reference,
}

public Object addingBundle(Bundle bundle, BundleEvent event) {
if (!requireProcessed.contains(bundle.getBundleId())) {
if (bundle != null && event != null && event.getType() == BundleEvent.STARTING) {
processRequire(bundle);
requireProcessed.add(bundle.getBundleId());
}

if ((bundle.getState() == Bundle.STARTING || bundle.getState() == Bundle.ACTIVE)
&& !active.contains(bundle.getBundleId())) {

try {
invokeActivatorCallback(CallbackType.START, bundle);
} finally {
Expand Down