3 files changed, 43 insertions, 19 deletions
diff --git a/lib/ic/c_src/oe_ei_encode_atom.c b/lib/ic/c_src/oe_ei_encode_atom.c
index 758586d1d4..99a9fe26f0 100644
--- a/lib/ic/c_src/oe_ei_encode_atom.c
+++ b/lib/ic/c_src/oe_ei_encode_atom.c
@@ -20,28 +20,37 @@
  */
 #include <ic.h>
 
+#include <string.h>
+
+
+#define DIRTY_ATOM_ENC_MAX(LATIN1_CHARS) ((LATIN1_CHARS)*2 + 3)
+
 
 int oe_ei_encode_atom(CORBA_Environment *ev, const char *p) { 
   int size = ev->_iout;
+  size_t len = strlen(p);
+
+  if (DIRTY_ATOM_ENC_MAX(len) >= ev->_outbufsz) {
+
+      ei_encode_atom_len(0,&size,p,len);
+
+      if (size >= ev->_outbufsz) {
+        char *buf = ev->_outbuf;
+        int bufsz = ev->_outbufsz + ev->_memchunk;
+
+        while (size >= bufsz)
+          bufsz += ev->_memchunk;
+
+        if ((buf = realloc(buf, bufsz)) == NULL) {
+          CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
+          return -1;  /* OUT OF MEMORY */
+        }
 
-  ei_encode_atom(0,&size,p);
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    while (size >= bufsz)
-      bufsz += ev->_memchunk;
-    
-    if ((buf = realloc(buf, bufsz)) == NULL) {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-
-    ev->_outbuf = buf;
-    ev->_outbufsz = bufsz;
+        ev->_outbuf = buf;
+        ev->_outbufsz = bufsz;
+      }
   }
 
-  return ei_encode_atom(ev->_outbuf,&ev->_iout,p);
+  return ei_encode_atom_len(ev->_outbuf,&ev->_iout,p,len);
 }
 
diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml
index fc68ec386c..38cc77ca98 100644
--- a/lib/ic/doc/src/notes.xml
+++ b/lib/ic/doc/src/notes.xml
@@ -31,7 +31,22 @@
     <file>notes.xml</file>
   </header>
 
-   <section><title>IC 4.4.3</title>
+   <section><title>IC 4.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Optimize encoding/decoding for pure 7-bit ascii atoms.</p>
+          <p>
+	    Own Id: OTP-15023 Aux Id: ERIERL-150 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>IC 4.4.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk
index b9f1ef7f20..d35d1dce1e 100644
--- a/lib/ic/vsn.mk
+++ b/lib/ic/vsn.mk
@@ -1 +1 @@
-IC_VSN = 4.4.3
+IC_VSN = 4.4.4