mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-23 02:58:00 +01:00
Ensure that Smack is initialized when calling ProviderManager
This commit is contained in:
parent
13f4f36995
commit
b0f774a2cf
2 changed files with 54 additions and 0 deletions
|
@ -22,6 +22,7 @@ import java.util.Collections;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
|
import org.jivesoftware.smack.SmackConfiguration;
|
||||||
import org.jivesoftware.smack.packet.IQ;
|
import org.jivesoftware.smack.packet.IQ;
|
||||||
import org.jxmpp.util.XmppStringUtils;
|
import org.jxmpp.util.XmppStringUtils;
|
||||||
|
|
||||||
|
@ -110,6 +111,14 @@ public final class ProviderManager {
|
||||||
private static final Map<String, Object> iqProviders = new ConcurrentHashMap<String, Object>();
|
private static final Map<String, Object> iqProviders = new ConcurrentHashMap<String, Object>();
|
||||||
private static final Map<String, StreamFeatureProvider> streamFeatureProviders = new ConcurrentHashMap<String, StreamFeatureProvider>();
|
private static final Map<String, StreamFeatureProvider> streamFeatureProviders = new ConcurrentHashMap<String, StreamFeatureProvider>();
|
||||||
|
|
||||||
|
static {
|
||||||
|
// Ensure that Smack is initialized by calling getVersion, so that user
|
||||||
|
// registered providers do not get overwritten by a following Smack
|
||||||
|
// initialization. This guarantees that Smack is initialized before a
|
||||||
|
// new provider is registered
|
||||||
|
SmackConfiguration.getVersion();
|
||||||
|
}
|
||||||
|
|
||||||
public static void addLoader(ProviderLoader loader) {
|
public static void addLoader(ProviderLoader loader) {
|
||||||
if (loader.getIQProviderInfo() != null) {
|
if (loader.getIQProviderInfo() != null) {
|
||||||
for (IQProviderInfo info : loader.getIQProviderInfo()) {
|
for (IQProviderInfo info : loader.getIQProviderInfo()) {
|
||||||
|
|
|
@ -0,0 +1,45 @@
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* Copyright © 2014 Florian Schmaus
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.jivesoftware.smack.provider;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
|
import org.jivesoftware.smack.SmackConfiguration;
|
||||||
|
import org.jivesoftware.smack.packet.IQ;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.xmlpull.v1.XmlPullParser;
|
||||||
|
|
||||||
|
public class ProviderManagerTest {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This test should be run in a clean (e.g. forked) VM
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void shouldInitializeSmackTest() throws Exception{
|
||||||
|
ProviderManager.addIQProvider("foo", "bar", new TestIQProvider());
|
||||||
|
assertTrue(SmackConfiguration.isSmackInitialized());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class TestIQProvider implements IQProvider {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IQ parseIQ(XmlPullParser parser) throws Exception {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue