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

Fix IOR tracing bug #236

Merged
merged 3 commits into from
Aug 14, 2024
Merged

Fix IOR tracing bug #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3b8fc3
TST: avoid deprecated Long constructor
joe-chacko Aug 12, 2024
a30acee
DEV: use modern Java idiom
joe-chacko Aug 12, 2024
301b6e0
DEV: don't read byte order twice when tracing IOR
joe-chacko Aug 13, 2024
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 testify/src/main/java/testify/annotation/ClassSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 IBM Corporation and others.
* Copyright 2024 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -38,7 +38,7 @@
@Documented
@ArgumentsSource(ClassSource.Provider.class)
public @interface ClassSource {
Class[] value();
Class<?>[] value();
class Provider implements ArgumentsProvider, AnnotationConsumer<ClassSource> {
private static final String ANNO_NAME = '@' + ClassSource.class.getSimpleName();
Class<?>[] classes;
Expand Down
8 changes: 4 additions & 4 deletions yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021 IBM Corporation and others.
* Copyright 2024 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -549,7 +549,7 @@ private synchronized void processLocateReply(GIOPIncomingMessage msg) {
try {
IOR ior = IORHelper.read(in);
down.setLocationForward(ior, false);
if (REQ_OUT_LOG.isLoggable(FINE)) REQ_OUT_LOG.fine("Locate request forwarded to " + IORDump.PrintObjref(orbInstance_.getORB(), ior));
if (REQ_OUT_LOG.isLoggable(FINE)) REQ_OUT_LOG.fine("Locate request forwarded to " + IORDump.describeIor(orbInstance_.getORB(), ior));

} catch (SystemException ex) {
warned(REQ_OUT_LOG, ex, "An error occurred while reading a locate reply, possibly indicating "
Expand All @@ -563,7 +563,7 @@ private synchronized void processLocateReply(GIOPIncomingMessage msg) {
try {
IOR ior = IORHelper.read(in);
down.setLocationForward(ior, true);
if (REQ_OUT_LOG.isLoggable(FINE)) REQ_OUT_LOG.fine("Locate request forwarded to " + IORDump.PrintObjref(orbInstance_.getORB(), ior));
if (REQ_OUT_LOG.isLoggable(FINE)) REQ_OUT_LOG.fine("Locate request forwarded to " + IORDump.describeIor(orbInstance_.getORB(), ior));
} catch (SystemException ex) {
warned(REQ_OUT_LOG, ex,"An error occurred while reading a locate reply, possibly indicating "
+ "an interoperability problem. You may need to set the LocateRequestPolicy to false.");
Expand Down Expand Up @@ -885,7 +885,7 @@ public void upcallForward(Upcall upcall, IOR ior, boolean perm, ServiceContexts
ReplyStatusType_1_2 status = perm ? ReplyStatusType_1_2.LOCATION_FORWARD_PERM : ReplyStatusType_1_2.LOCATION_FORWARD;
try {
outgoing.writeReplyHeader(reqId, status, contexts);
if (REQ_IN_LOG.isLoggable(FINE)) REQ_IN_LOG.fine("Sending forward reply to " + IORDump.PrintObjref(orbInstance_.getORB(), ior));
if (REQ_IN_LOG.isLoggable(FINE)) REQ_IN_LOG.fine("Sending forward reply to " + IORDump.describeIor(orbInstance_.getORB(), ior));
IORHelper.write(out, ior);
} catch (SystemException ex) {
// Nothing may go wrong here, otherwise we might have a
Expand Down
Loading
Loading