LoaderPool now checks loadable.equals,

instead of just comparing the instance.
captchafix
Florens Douwes 11 years ago
parent 1eafe4cbfd
commit 7a60f3047f
  1. 19
      Chan/src/org/floens/chan/core/loader/LoaderPool.java
  2. 2
      Chan/src/org/floens/chan/core/model/Loadable.java

@ -21,7 +21,14 @@ public class LoaderPool {
} }
public Loader obtain(Loadable loadable, Loader.LoaderListener listener) { public Loader obtain(Loadable loadable, Loader.LoaderListener listener) {
Loader loader = loaders.get(loadable); Loader loader = null;
for (Loadable l : loaders.keySet()) {
if (loadable.equals(l)) {
loader = loaders.get(l);
break;
}
}
if (loader == null) { if (loader == null) {
loader = new Loader(loadable); loader = new Loader(loadable);
loaders.put(loadable, loader); loaders.put(loadable, loader);
@ -33,7 +40,15 @@ public class LoaderPool {
} }
public void release(Loader loader, Loader.LoaderListener listener) { public void release(Loader loader, Loader.LoaderListener listener) {
if (!loaders.containsValue(loader)) { Loader foundLoader = null;
for (Loadable l : loaders.keySet()) {
if (loader.getLoadable().equals(l)) {
foundLoader = loaders.get(l);
break;
}
}
if (foundLoader == null) {
throw new RuntimeException("The released loader does not exist"); throw new RuntimeException("The released loader does not exist");
} }

@ -82,7 +82,7 @@ public class Loadable {
} }
/** /**
* Does not compare the title. * Compares the mode, board and no.
*/ */
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {

Loading…
Cancel
Save