Commit 31bc249d authored by Andre Freyssinet's avatar Andre Freyssinet

Fix potential compatbility issues with serialization (JORAM-330).

parent 8b259a93
/*
* Copyright (C) 2013 ScalAgent Distributed Technologies
* Copyright (C) 2013 - 2019 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -32,6 +32,8 @@ package fr.dyade.aaa.agent;
* incremented and decremented once for every <code>CallbackNotification</code>.
*/
public class CallbackNotification extends Notification {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = 5725173357445928809L;
private transient CountDownCallback countDownCallback;
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2001 - 2003 ScalAgent Distributed Technologies
* Copyright (C) 2001 - 2019 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -26,8 +26,9 @@ import fr.dyade.aaa.jndi2.msg.*;
import javax.naming.*;
public abstract class RequestContext
implements java.io.Serializable {
public abstract class RequestContext implements java.io.Serializable {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = 9185021686499463557L;
private CompositeName resolvedName;
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2007 - 2013 ScalAgent Distributed Technologies
* Copyright (C) 2007 - 2019 ScalAgent Distributed Technologies
* Copyright (C) 2007 France Telecom R&D
*
* This library is free software; you can redistribute it and/or
......@@ -52,7 +52,9 @@ import fr.dyade.aaa.common.Debug;
* Implements the <code>javax.jms.ConnectionFactory</code> interface.
*/
public abstract class AbstractConnectionFactory extends AdministeredObject {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = -4654044059180563323L;
private static Logger logger = Debug.getLogger(AbstractConnectionFactory.class.getName());
/** Object containing the factory's parameters. */
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2013 ScalAgent Distributed Technologies
* Copyright (C) 2013 - 2019 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -36,7 +36,9 @@ import fr.dyade.aaa.common.encoding.EncodableFactory;
import fr.dyade.aaa.common.encoding.Encoder;
public class QueueArrivalState implements Encodable, Serializable {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = 8781424702189250843L;
public static Logger logger = Debug.getLogger(QueueArrivalState.class.getName());
public static QueueArrivalState load(String id) throws Exception {
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2013 ScalAgent Distributed Technologies
* Copyright (C) 2013 - 2019 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -32,6 +32,8 @@ import fr.dyade.aaa.common.encoding.Encodable;
import fr.dyade.aaa.common.encoding.Encoder;
public class QueueDelivery implements Encodable, Serializable {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = 8114112983207655810L;
private AgentId consumerId;
......
......@@ -42,6 +42,9 @@ import fr.dyade.aaa.common.encoding.EncodableHelper;
import fr.dyade.aaa.common.encoding.Encoder;
public class QueueDeliveryTable implements Encodable, Serializable {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = -4062834409427547337L;
public static Logger logger = Debug.getLogger(QueueDeliveryTable.class.getName());
public static QueueDeliveryTable load(String txName) throws Exception {
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2001 - 2009 ScalAgent Distributed Technologies
* Copyright (C) 1996 - Dyade
* Copyright (C) 2001 - 2019 ScalAgent Distributed Technologies
* Copyright (C) 1996 - 2000 Dyade
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -33,6 +33,9 @@ import fr.dyade.aaa.common.encoding.Encoder;
* notifications exchanged by a client agent and a MOM destination agent.
*/
public abstract class AbstractNotification extends CallbackNotification {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = -1933719957724933079L;
/**
* The <code>clientContext</code> field allows a client to identify a context
* within which a notification is exchanged with a destination.
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2001 - 2010 ScalAgent Distributed Technologies
* Copyright (C) 2001 - 2019 ScalAgent Distributed Technologies
* Copyright (C) 1996 - 2000 Dyade
*
* This library is free software; you can redistribute it and/or
......@@ -28,6 +28,9 @@ package org.objectweb.joram.mom.notifications;
* a client agent.
*/
public abstract class AbstractReplyNot extends AbstractNotification {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = -5283973981895033090L;
/**
* The <code>correlationId</code> field is equal to the request's
* identifier.
......@@ -41,8 +44,7 @@ public abstract class AbstractReplyNot extends AbstractNotification {
* @param clientContext Client context identifier.
* @param correlationId Identifier of the reply.
*/
public AbstractReplyNot(int clientContext, int correlationId)
{
public AbstractReplyNot(int clientContext, int correlationId) {
super(clientContext);
this.correlationId = correlationId;
}
......@@ -50,13 +52,11 @@ public abstract class AbstractReplyNot extends AbstractNotification {
/**
* Constructs an <code>AbstractReply</code>.
*/
public AbstractReplyNot()
{}
public AbstractReplyNot() {}
/** Returns the reply identifier. */
public int getCorrelationId()
{
public int getCorrelationId() {
return correlationId;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2001 - 2010 ScalAgent Distributed Technologies
* Copyright (C) 2001 - 2019 ScalAgent Distributed Technologies
* Copyright (C) 1996 - 2000 Dyade
*
* This library is free software; you can redistribute it and/or
......@@ -31,6 +31,9 @@ import fr.dyade.aaa.common.encoding.Encoder;
* a destination agent.
*/
public abstract class AbstractRequestNot extends AbstractNotification {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = -7029517541826292641L;
/**
* The <code>requestId</code> field allows a client to identify the request
* sent to a destination.
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2013 ScalAgent Distributed Technologies
* Copyright (C) 2013 - 2019 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -36,6 +36,8 @@ import fr.dyade.aaa.common.encoding.EncodableFactory;
import fr.dyade.aaa.common.encoding.Encoder;
public class UserAgentArrivalState implements Encodable, Serializable {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = 5250075640984219772L;
public static Logger logger = Debug.getLogger(UserAgentArrivalState.class.getName());
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2013 ScalAgent Distributed Technologies
* Copyright (C) 2013 - 2019 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -26,8 +26,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import org.objectweb.joram.mom.proxies.UserAgentArrivalState;
import fr.dyade.aaa.agent.AgentServer;
import fr.dyade.aaa.common.encoding.Decoder;
import fr.dyade.aaa.common.encoding.Encodable;
......@@ -35,8 +33,9 @@ import fr.dyade.aaa.common.encoding.EncodableFactory;
import fr.dyade.aaa.common.encoding.EncodableHelper;
import fr.dyade.aaa.common.encoding.Encoder;
public class MessageIdListImpl implements MessageIdList, Encodable,
Serializable {
public class MessageIdListImpl implements MessageIdList, Encodable, Serializable {
/** define serialVersionUID for interoperability, fix with 5.15.0 value */
private static final long serialVersionUID = -3470039435921556495L;
private String listId;
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2013 - 2016 ScalAgent Distributed Technologies
* Copyright (C) 2013 - 2019 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -34,8 +34,6 @@ import fr.dyade.aaa.agent.Channel;
* Task sending a TopicDeliveryTimeNot to a UserAgent.
*/
public class TopicDeliveryTimeTask extends TimerTask {
private static final long serialVersionUID = 1L;
private AgentId destId = null;
private Message msg = null;
private AgentId topic = null;
......@@ -54,5 +52,4 @@ public class TopicDeliveryTimeTask extends TimerTask {
public void run() {
Channel.sendTo(destId, new TopicDeliveryTimeNot(msg, topic, subName));
}
}
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2010 - 2018 ScalAgent Distributed Technologies
* Copyright (C) 2010 - 2019 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -50,6 +50,8 @@ import fr.dyade.aaa.common.Debug;
import fr.dyade.aaa.util.management.MXWrapper;
public class JMSModule implements ExceptionListener, Serializable, JMSModuleMBean {
/** define serialVersionUID for interoperability, fix with 5.16.0 value */
private static final long serialVersionUID = 6503560328263372094L;
private static final Logger logger = Debug.getLogger(JMSModule.class.getName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment