Skip to content
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

Jump to bottom

FISH-1175 Fix Typo in '@Clustered' API #6024

Merged
merged 2 commits into from
Nov 17, 2022
Merged

FISH-1175 Fix Typo in '@Clustered' API #6024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7dfb23
FISH-1175 Fix typo in Clustered API
Pandrex247 Nov 9, 2022
b106399
FISH-1175 Adjust for fixed typo
Pandrex247 Nov 9, 2022
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
4 changes: 2 additions & 2 deletions api/payara-api/src/main/java/fish/payara/cluster/Clustered.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) [2016-2017] Payara Foundation and/or its affiliates. All rights reserved.
* Copyright (c) [2016-2022] Payara Foundation and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
Expand Down Expand Up @@ -84,5 +84,5 @@
* and this singleton also exists on the other node. (not truly destroyed)
* Default is true
*/
boolean callPreDestoyOnDetach () default true;
boolean callPreDestroyOnDetach () default true;
}
4 changes: 2 additions & 2 deletions ...iner/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
// Portions Copyright [2016-2021] [Payara Foundation and/or its affiliates]
// Portions Copyright [2016-2022] [Payara Foundation and/or its affiliates]

package org.glassfish.ejb.deployment.annotation.handlers;

Expand Down Expand Up @@ -171,7 +171,7 @@ private void doSingletonSpecificProcessing(EjbSessionDescriptor desc, Class<?> e
desc.setClustered(true);
desc.setClusteredKeyValue(clusteredAnnotation.keyName());
desc.setDontCallPostConstructOnAttach(!clusteredAnnotation.callPostConstructOnAttach());
desc.setDontCallPreDestroyOnDetach(!clusteredAnnotation.callPreDestoyOnDetach());
desc.setDontCallPreDestroyOnDetach(!clusteredAnnotation.callPreDestroyOnDetach());
}
}
}
4 changes: 2 additions & 2 deletions ...o-cdi/src/main/java/fish/payara/micro/cdi/extension/cluster/ClusterScopedInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) [2016-2021] Payara Foundation and/or its affiliates. All rights reserved.
* Copyright (c) [2016-2022] Payara Foundation and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
Expand Down Expand Up @@ -108,7 +108,7 @@ Object preDestroy(InvocationContext invocationContext) throws Exception {
IAtomicLong count = clusteredLookup.getClusteredUsageCount();
if (count.decrementAndGet() <= 0) {
clusteredLookup.destroy();
} else if (!clusteredAnnotation.callPreDestoyOnDetach()) {
} else if (!clusteredAnnotation.callPreDestroyOnDetach()) {
return null;
}

Expand Down