This should be enough to revert the two commits (I don't know if there were
others, maybe I will check later in the weekend).
Jacopo
Index: framework/service/src/org/ofbiz/service/ServiceDispatcher.java
===================================================================
--- framework/service/src/org/ofbiz/service/ServiceDispatcher.java
(revision 1353094)
+++ framework/service/src/org/ofbiz/service/ServiceDispatcher.java
(working copy)
@@ -118,7 +118,7 @@
// make sure we haven't disabled these features from running
if (enableJMS) {
- this.jlf = JmsListenerFactory.getInstance(this);
+ this.jlf = new JmsListenerFactory(this);
}
if (enableSvcs) {
Index: framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
===================================================================
--- framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
(revision 1352570)
+++ framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
(working copy)
@@ -47,27 +47,12 @@
protected static Map<String, GenericMessageListener> listeners =
FastMap.newInstance();
protected static Map<String, Element> servers = FastMap.newInstance();
- protected static JmsListenerFactory jlf = null;
-
protected ServiceDispatcher dispatcher;
protected boolean firstPass = true;
protected int loadable = 0;
protected int connected = 0;
protected Thread thread;
-
- public static JmsListenerFactory getInstance(ServiceDispatcher dispatcher){
- if (jlf == null) {
- synchronized (JmsListenerFactory.class) {
- if (jlf == null) {
- jlf = new JmsListenerFactory(dispatcher);
- }
- }
- }
-
- return jlf;
- }
-
public JmsListenerFactory(ServiceDispatcher dispatcher) {
this.dispatcher = dispatcher;
thread = new Thread(this, this.toString());
On Jun 23, 2012, at 10:59 AM, Jacques Le Roux wrote:
> Yes, this or reverting all and restarting from scratch, I'm looking at it now
>
> Jacques
>
> From: "Jacopo Cappellato" <[email protected]>
>> I can also help in this; but it would be really helpful if you could provide
>> one diff of all the changes you did (I mean a diff between the current
>> version and the original version.... excluding all the commits/reverts
>> happened between them) and if you could recall all the issues you were
>> trying to fix.
>>
>> Regards,
>>
>> Jacopo
>>
>> On Jun 22, 2012, at 2:18 PM, Jacques Le Roux wrote:
>>
>>> I will have a look this weekend...
>>>
>>> Jacques
>>>
>>> From: "Jacques Le Roux" <[email protected]>
>>>> From: "Jacopo Cappellato" <[email protected]>
>>>>> On Jun 22, 2012, at 11:36 AM, Jacques Le Roux wrote:
>>>>>
>>>>>> https://issues.apache.org/jira/browse/OFBIZ-4453 seems the last
>>>>>> interesting issue following
>>>>>> https://issues.apache.org/jira/browse/OFBIZ-4296
>>>>>> See also https://issues.apache.org/jira/browse/OFBIZ-4454
>>>>>
>>>>> annoying... in short, the old JMS support has been broken by a series of
>>>>> non appropriate fixes (that has been committed to trunk and backported to
>>>>> branches) and then it was decided that a refactoring was necessary.
>>>>
>>>> There were issues, else I will not have messed with that. Notably when
>>>> using DCC, IIRW...
>>>>
>>>> Jacques
>>>>
>>>>> Jacopo
>>>>>
>>
