Skip to content

Commit 578a8a4

Browse files
committed
Don't use WeakReference for Method container
1 parent 02d3ad3 commit 578a8a4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/main/java/org/maxgamer/quickshop/util/reload/ReloadManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public synchronized void register(@NotNull Reloadable reloadable) {
5151
*/
5252
public synchronized void register(@NotNull Method reloadMethod) {
5353
unregister(reloadMethod);
54-
this.registry.add(new ReloadableContainer(null, new WeakReference<>(reloadMethod)));
54+
this.registry.add(new ReloadableContainer(null, reloadMethod));
5555
}
5656

5757
/**
@@ -62,7 +62,7 @@ public synchronized void register(@NotNull Method reloadMethod) {
6262
public synchronized void unregister(@NotNull Method reloadMethod) {
6363
this.registry.removeIf(reloadableContainer -> {
6464
if (reloadableContainer.getReloadableMethod() != null) {
65-
Method method = reloadableContainer.getReloadableMethod().get();
65+
Method method = reloadableContainer.getReloadableMethod();
6666
return reloadMethod.equals(method);
6767
} else {
6868
return false;
@@ -91,7 +91,7 @@ public synchronized void unregister(@NotNull Class<Reloadable> clazz) {
9191
return clazz.equals(reloadable.getReloadable().getClass());
9292
}
9393
if (reloadable.getReloadableMethod() != null) {
94-
Method method = reloadable.getReloadableMethod().get();
94+
Method method = reloadable.getReloadableMethod();
9595
if (method != null)
9696
return clazz.equals(method.getDeclaringClass());
9797
}
@@ -128,7 +128,7 @@ public synchronized Map<ReloadableContainer, ReloadResult> reload(@Nullable Clas
128128
}
129129
}
130130
if (reloadable.getReloadableMethod() != null) {
131-
Method method = reloadable.getReloadableMethod().get();
131+
Method method = reloadable.getReloadableMethod();
132132
if (method != null) {
133133
if (!clazz.equals(method.getDeclaringClass())) {
134134
continue;
@@ -147,7 +147,7 @@ public synchronized Map<ReloadableContainer, ReloadResult> reload(@Nullable Clas
147147
reloadResult = new ReloadResult(ReloadStatus.OUTDATED, "Object has been invalid", null);
148148
}
149149
} else if (reloadable.getReloadableMethod() != null) {
150-
Method method = reloadable.getReloadableMethod().get();
150+
Method method = reloadable.getReloadableMethod();
151151
if (method != null) {
152152
reloadResult = (ReloadResult) method.invoke(null);
153153
} else {

src/main/java/org/maxgamer/quickshop/util/reload/ReloadableContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class ReloadableContainer {
3434
@Nullable
3535
private WeakReference<Reloadable> reloadable;
3636
@Nullable
37-
private WeakReference<Method> reloadableMethod;
37+
private Method reloadableMethod;
3838

3939
public boolean isObject() {
4040
return reloadable != null;

0 commit comments

Comments
 (0)