Skip to content

Commit

Permalink
expected resource not found: /META-INF/javamail.default.address.map j…
Browse files Browse the repository at this point in the history
…akartaee#598

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
  • Loading branch information
jbescos committed Apr 1, 2022
1 parent 13dee2b commit f644d88
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2021 Contributors to the Eclipse Foundation
# Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -42,4 +42,4 @@ jobs:
- name: Verify
run: |
cd api
mvn -B -U -C -V clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Poss-release,staging -Dgpg.skip=true
mvn -B -U -C -V clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Poss-release,staging -Dcopyright.ignoreyear=true -Dgpg.skip=true
10 changes: 6 additions & 4 deletions api/src/main/java/jakarta/mail/Session.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -261,10 +261,12 @@ private Session(Properties props, Authenticator authenticator) {

// get the Class associated with the Authenticator
Class<?> cl;
if (authenticator != null)
if (authenticator != null) {
cl = authenticator.getClass();
else
cl = this.getClass();
} else {
// Use implementation class, because that class loader has access to jakarta.mail module and implementation resources
cl = streamProvider.getClass();
}
// load the resources
loadProviders(cl);
loadAddressMap(cl);
Expand Down

0 comments on commit f644d88

Please sign in to comment.