Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use YASF negotiation to maintain stream compatibility when talking En…
…ums to unfixed yoko
- Loading branch information
Showing
15 changed files
with
315 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 0 additions & 71 deletions
71
yoko-core/src/main/java/org/apache/yoko/orb/yasf/Yasf.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
yoko-core/src/main/java/org/apache/yoko/orb/yasf/YasfHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package org.apache.yoko.orb.yasf; | ||
|
|
||
| import org.apache.yoko.util.yasf.Yasf; | ||
| import org.omg.CORBA.Any; | ||
| import org.omg.CORBA.BAD_PARAM; | ||
| import org.omg.CORBA.INTERNAL; | ||
| import org.omg.CORBA.ORB; | ||
| import org.omg.IOP.ServiceContext; | ||
| import org.omg.IOP.TaggedComponent; | ||
| import org.omg.PortableInterceptor.ClientRequestInfo; | ||
| import org.omg.PortableInterceptor.IORInfo; | ||
| import org.omg.PortableInterceptor.InvalidSlot; | ||
| import org.omg.PortableInterceptor.ServerRequestInfo; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| import static org.apache.yoko.orb.OB.MinorCodes.MinorInvalidComponentId; | ||
| import static org.apache.yoko.orb.OB.MinorCodes.MinorInvalidServiceContextId; | ||
|
|
||
| /** | ||
| * Created by nrichard on 23/03/16. | ||
| */ | ||
| public enum YasfHelper { | ||
| ; | ||
|
|
||
| public static void addTc(IORInfo info, Set<Yasf> set) { | ||
| TaggedComponent tc = new TaggedComponent(Yasf.TAG_YOKO_AUXILLIARY_STREAM_FORMAT, Yasf.toData(set)); | ||
| info.add_ior_component(tc); | ||
| } | ||
|
|
||
| private static ServiceContext sc(Set<Yasf> set) { | ||
| return new ServiceContext(Yasf.YOKO_AUXIllIARY_STREAM_FORMAT_SC, Yasf.toData(set)); | ||
| } | ||
|
|
||
| public static void addSc(ClientRequestInfo ri, Set<Yasf> set) { | ||
| ServiceContext sc = sc(set); | ||
| ri.add_request_service_context(sc, false); | ||
| } | ||
|
|
||
| public static void addSc(ServerRequestInfo ri, Set<Yasf> set) { | ||
| ServiceContext sc = sc(set); | ||
| ri.add_reply_service_context(sc, false); | ||
| } | ||
|
|
||
| public static byte[] readData(ClientRequestInfo ri) { | ||
| try { | ||
| TaggedComponent tc = ri.get_effective_component(Yasf.TAG_YOKO_AUXILLIARY_STREAM_FORMAT); | ||
| return tc.component_data; | ||
| } catch (BAD_PARAM e) { | ||
| if (e.minor != MinorInvalidComponentId) { | ||
| throw e; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static byte[] readData(ServerRequestInfo ri) { | ||
| try { | ||
| ServiceContext sc = ri.get_request_service_context(Yasf.YOKO_AUXIllIARY_STREAM_FORMAT_SC); | ||
| return sc.context_data; | ||
| } catch (BAD_PARAM e) { | ||
| if (e.minor != MinorInvalidServiceContextId) { | ||
| throw e; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static void setSlot(int slotId, ServerRequestInfo ri, byte[] data) { | ||
| Any any = ORB.init().create_any(); | ||
| any.insert_Value(data); | ||
| try { | ||
| ri.set_slot(slotId, any); | ||
| } catch (InvalidSlot e) { | ||
| throw (INTERNAL)(new INTERNAL(e.getMessage())).initCause(e); | ||
| } | ||
| } | ||
|
|
||
| public static byte[] getSlot(int slotId, ServerRequestInfo ri) { | ||
| try { | ||
| Any any = ri.get_slot(slotId); | ||
| return (byte[])any.extract_Value(); | ||
| } catch (InvalidSlot e) { | ||
| throw (INTERNAL)(new INTERNAL(e.getMessage())).initCause(e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.